Fix pom.xml conflict