Fix rebase problems.