Resolved conflicts in merged pom.xml