Delete crap leftover from conflict correction