repair bad merge