Fix merge anomaly