Remove leftover conflict markers