Update pom.xml

Fix bad merge