cleanup rebase mess