Remove leftover conflict marker.