Fix a merge error.