cleanup bad rebase