remove HEAD text from a previously failed merge