removing garbage from a broken merge