correcting abusive merge