Remove remnants of a bad merge