conflictResolution_4