Fix some merge commit issues with pom versioning.