Update pom.xml because of conflicts