fix merge defect