conflictResolution_6