Remove cruft from git merge