getConflictResolution