clean up after rebase/merge