repair rebase mistake