remove cruft left from a bad merge