Continue fixing rebase mistake.