diff --git a/pkg/harvester/config/feature-flags.js b/pkg/harvester/config/feature-flags.js
index 61446889..2cfeb945 100644
--- a/pkg/harvester/config/feature-flags.js
+++ b/pkg/harvester/config/feature-flags.js
@@ -49,11 +49,8 @@ const featuresV142 = [
 const featuresV150 = [
   ...featuresV142,
   'tpmPersistentState',
-<<<<<<< HEAD
-  'untaggedNetworkSetting'
-=======
+  'untaggedNetworkSetting',
   'skipSingleReplicaDetachedVol'
->>>>>>> 72c6741 (feat: add feature flag)
 ];
 
 export const RELEASE_FEATURES = {