Fix the rebase issue.