remove merge conflict cruft