Fix a merge problem.