Pass merge state into ConflictMarkers as well.