Cleaning a git-merge-created conflict in version