clean up rebase/merge crufties