Fix merge

Author: aliu39

packages/browser/src/integrations/featureFlags/launchdarkly/integration.ts

@@ -49,13 +49,8 @@ export function buildLaunchDarklyFlagUsedHandler(): LDInspectionFlagUsedHandler
      * Handle a flag evaluation by storing its name and value on the current scope.
      */
     method: (flagKey: string, flagDetail: LDEvaluationDetail, _context: LDContext) => {
-<<<<<<< HEAD
       _INTERNAL_insertFlagToScope(flagKey, flagDetail.value);
       _INTERNAL_addFeatureFlagToActiveSpan(flagKey, flagDetail.value);
-=======
-      insertFlagToScope(flagKey, flagDetail.value);
-      addFeatureFlagToActiveSpan(flagKey, flagDetail.value);
->>>>>>> a323c38aad748683232bdae557dd0afc4e682c74
     },
   };
 }

packages/browser/src/integrations/featureFlags/openfeature/integration.ts

@@ -40,25 +40,15 @@ export class OpenFeatureIntegrationHook implements OpenFeatureHook {
    * Successful evaluation result.
    */
   public after(_hookContext: Readonly<HookContext<JsonValue>>, evaluationDetails: EvaluationDetails<JsonValue>): void {
-<<<<<<< HEAD
     _INTERNAL_insertFlagToScope(evaluationDetails.flagKey, evaluationDetails.value);
     _INTERNAL_addFeatureFlagToActiveSpan(evaluationDetails.flagKey, evaluationDetails.value);
-=======
-    insertFlagToScope(evaluationDetails.flagKey, evaluationDetails.value);
-    addFeatureFlagToActiveSpan(evaluationDetails.flagKey, evaluationDetails.value);
->>>>>>> a323c38aad748683232bdae557dd0afc4e682c74
   }
 
   /**
    * On error evaluation result.
    */
   public error(hookContext: Readonly<HookContext<JsonValue>>, _error: unknown, _hookHints?: HookHints): void {
-<<<<<<< HEAD
     _INTERNAL_insertFlagToScope(hookContext.flagKey, hookContext.defaultValue);
     _INTERNAL_addFeatureFlagToActiveSpan(hookContext.flagKey, hookContext.defaultValue);
-=======
-    insertFlagToScope(hookContext.flagKey, hookContext.defaultValue);
-    addFeatureFlagToActiveSpan(hookContext.flagKey, hookContext.defaultValue);
->>>>>>> a323c38aad748683232bdae557dd0afc4e682c74
   }
 }

packages/browser/src/integrations/featureFlags/statsig/integration.ts

@@ -37,13 +37,8 @@ export const statsigIntegration = defineIntegration(
 
       setup(_client: Client) {
         statsigClient.on('gate_evaluation', (event: { gate: FeatureGate }) => {
-<<<<<<< HEAD
           _INTERNAL_insertFlagToScope(event.gate.name, event.gate.value);
           _INTERNAL_addFeatureFlagToActiveSpan(event.gate.name, event.gate.value);
-=======
-          insertFlagToScope(event.gate.name, event.gate.value);
-          addFeatureFlagToActiveSpan(event.gate.name, event.gate.value);
->>>>>>> a323c38aad748683232bdae557dd0afc4e682c74
         });
       },
 

packages/browser/src/integrations/featureFlags/unleash/integration.ts

@@ -70,13 +70,8 @@ function _wrappedIsEnabled(
     const result = original.apply(this, args);
 
     if (typeof toggleName === 'string' && typeof result === 'boolean') {
-<<<<<<< HEAD
       _INTERNAL_insertFlagToScope(toggleName, result);
       _INTERNAL_addFeatureFlagToActiveSpan(toggleName, result);
-=======
-      insertFlagToScope(toggleName, result);
-      addFeatureFlagToActiveSpan(toggleName, result);
->>>>>>> a323c38aad748683232bdae557dd0afc4e682c74
     } else if (DEBUG_BUILD) {
       logger.error(
         `[Feature Flags] UnleashClient.isEnabled does not match expected signature. arg0: ${toggleName} (${typeof toggleName}), result: ${result} (${typeof result})`,

packages/core/src/integrations/featureFlags/featureFlagsIntegration.ts

@@ -45,13 +45,8 @@ export const featureFlagsIntegration = defineIntegration(() => {
     },
 
     addFeatureFlag(name: string, value: unknown): void {
-<<<<<<< HEAD:packages/core/src/integrations/featureFlags/featureFlagsIntegration.ts
       _INTERNAL_insertFlagToScope(name, value);
       _INTERNAL_addFeatureFlagToActiveSpan(name, value);
-=======
-      insertFlagToScope(name, value);
-      addFeatureFlagToActiveSpan(name, value);
->>>>>>> a323c38aad748683232bdae557dd0afc4e682c74:packages/browser/src/integrations/featureFlags/featureFlagsIntegration.ts
     },
   };
 }) as IntegrationFn<FeatureFlagsIntegration>;