Fix a merge anomaly