fixed merge anomaly error