Remove all the rebase mistakes