Correct the merge mistake