Fix a merge error