pom.xml: removed conflict markers