Removed spurious manual merge error in pom.xml