rebase: cleanup rebasing with --merge