Cleanup conflict markers