Fix merge conflict in pom.xml