merge conflict cruft