062221ConflictResolution