conflictResolution_2