Fix the merge