[REBASE] Fix rebase merge mistakes.