remove bad merge