Fix rebase errors.