Fix the merge.