Fix the merge mistake.