Fix the merge conflict