Cleanup of pom.xml after merge problems.