Fix maven warnings about duplicate declarations