conflictResolution