Finish getting rid of those conflict markers.