Fixing Bad Rebase