repare hazardous merge