Remove leftover git merge messages