Update pom.xml

Fixing merging problems