diff --git a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/StrategyChangeOverwriteWarning.tsx b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/StrategyChangeOverwriteWarning.tsx
index ccae24d905..7387f22b6c 100644
--- a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/StrategyChangeOverwriteWarning.tsx
+++ b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/StrategyChangeOverwriteWarning.tsx
@@ -1,6 +1,7 @@
 import { Box, styled } from '@mui/material';
 import { useChangeRequestPlausibleContext } from 'component/changeRequest/ChangeRequestContext';
 import {
+    IChangeRequestPatchVariant,
     IChangeRequestUpdateSegment,
     IChangeRequestUpdateStrategy,
 } from 'component/changeRequest/changeRequest.types';
@@ -9,10 +10,12 @@ import { ISegment } from 'interfaces/segment';
 import { IFeatureStrategy } from 'interfaces/strategy';
 import {
     ChangesThatWouldBeOverwritten,
+    getEnvVariantChangesThatWouldBeOverwritten,
     getStrategyChangesThatWouldBeOverwritten,
     getSegmentChangesThatWouldBeOverwritten,
 } from './strategy-change-diff-calculation';
 import { useEffect } from 'react';
+import { IFeatureVariant } from 'interfaces/featureToggle';
 
 const ChangesToOverwriteContainer = styled(Box)(({ theme }) => ({
     color: theme.palette.warning.dark,
@@ -135,13 +138,13 @@ const DetailsTable: React.FC<{
 };
 
 const OverwriteWarning: React.FC<{
-    changeType: 'segment' | 'strategy';
+    changeType: 'segment' | 'strategy' | 'environment variant configuration';
     changesThatWouldBeOverwritten: ChangesThatWouldBeOverwritten;
 }> = ({ changeType, changesThatWouldBeOverwritten }) => {
     return (
         <ChangesToOverwriteContainer>
             <p>
-                <strong>Heads up!</strong> The ${changeType} has been updated
+                <strong>Heads up!</strong> The {changeType} has been updated
                 since you made your changes. Applying this change now would
                 overwrite the configuration that is currently live.
             </p>
@@ -157,6 +160,27 @@ const OverwriteWarning: React.FC<{
     );
 };
 
+export const EnvVariantChangesToOverwrite: React.FC<{
+    currentVariants?: IFeatureVariant[];
+    change: IChangeRequestPatchVariant;
+}> = ({ change, currentVariants }) => {
+    const checkForChanges = useUiFlag('changeRequestConflictHandling');
+    const changesThatWouldBeOverwritten = checkForChanges
+        ? getEnvVariantChangesThatWouldBeOverwritten(currentVariants, change)
+        : null;
+
+    if (!changesThatWouldBeOverwritten) {
+        return null;
+    }
+
+    return (
+        <OverwriteWarning
+            changeType='environment variant configuration'
+            changesThatWouldBeOverwritten={changesThatWouldBeOverwritten}
+        />
+    );
+};
+
 export const SegmentChangesToOverwrite: React.FC<{
     currentSegment?: ISegment;
     change: IChangeRequestUpdateSegment;
diff --git a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/VariantPatch/VariantPatch.tsx b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/VariantPatch/VariantPatch.tsx
index 656a881f32..d216752d6e 100644
--- a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/VariantPatch/VariantPatch.tsx
+++ b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/VariantPatch/VariantPatch.tsx
@@ -6,6 +6,7 @@ import { TooltipLink } from 'component/common/TooltipLink/TooltipLink';
 import { EnvironmentVariantsTable } from 'component/feature/FeatureView/FeatureVariants/FeatureEnvironmentVariants/EnvironmentVariantsCard/EnvironmentVariantsTable/EnvironmentVariantsTable';
 import { useFeature } from 'hooks/api/getters/useFeature/useFeature';
 import { ReactNode } from 'react';
+import { EnvVariantChangesToOverwrite } from '../StrategyChangeOverwriteWarning';
 import { VariantDiff } from './VariantDiff';
 
 const ChangeItemInfo = styled(Box)({
@@ -53,6 +54,10 @@ export const VariantPatch = ({
 
     return (
         <ChangeItemInfo>
+            <EnvVariantChangesToOverwrite
+                currentVariants={preData}
+                change={change}
+            />
             <StyledChangeHeader>
                 <TooltipLink
                     tooltip={
diff --git a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/strategy-change-diff-calculation.ts b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/strategy-change-diff-calculation.ts
index 97bafca54e..fb9a468246 100644
--- a/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/strategy-change-diff-calculation.ts
+++ b/frontend/src/component/changeRequest/ChangeRequest/Changes/Change/strategy-change-diff-calculation.ts
@@ -1,7 +1,9 @@
 import {
+    IChangeRequestPatchVariant,
     IChangeRequestUpdateSegment,
     IChangeRequestUpdateStrategy,
 } from 'component/changeRequest/changeRequest.types';
+import { IFeatureVariant } from 'interfaces/featureToggle';
 import { ISegment } from 'interfaces/segment';
 import { IFeatureStrategy } from 'interfaces/strategy';
 import isEqual from 'lodash.isequal';
@@ -106,6 +108,23 @@ function getChangesThatWouldBeOverwritten<T>(
     return null;
 }
 
+export function getEnvVariantChangesThatWouldBeOverwritten(
+    currentVariantConfig: IFeatureVariant[] | undefined,
+    change: IChangeRequestPatchVariant,
+): ChangesThatWouldBeOverwritten | null {
+    const { snapshot } = change.payload;
+    if (!snapshot || !currentVariantConfig) return null;
+
+    const conflict = getChangedPropertyWithFallbacks({})(
+        'variants',
+        currentVariantConfig,
+        snapshot,
+        change.payload.variants,
+    );
+
+    return conflict ? [conflict] : null;
+}
+
 export function getSegmentChangesThatWouldBeOverwritten(
     currentSegmentConfig: ISegment | undefined,
     change: IChangeRequestUpdateSegment,
diff --git a/frontend/src/component/changeRequest/changeRequest.types.ts b/frontend/src/component/changeRequest/changeRequest.types.ts
index 33dbe168ec..685070be91 100644
--- a/frontend/src/component/changeRequest/changeRequest.types.ts
+++ b/frontend/src/component/changeRequest/changeRequest.types.ts
@@ -218,6 +218,7 @@ export type ISegmentChange =
 
 type ChangeRequestVariantPatch = {
     variants: IFeatureVariant[];
+    snapshot?: IFeatureVariant[];
 };
 
 type ChangeRequestEnabled = { enabled: boolean };