get rid of a bad merge