Fix a merge problem