fixed merge defect