manually fixed merge conflict in pom.xml