Remove merge conflict cruft