Rebase properly.