Fix the bug after fixing the merge.