Remove leftover stuff from failed merge