diff --git a/pkg/harvester/config/feature-flags.js b/pkg/harvester/config/feature-flags.js
index e5a95347..09ade9c2 100644
--- a/pkg/harvester/config/feature-flags.js
+++ b/pkg/harvester/config/feature-flags.js
@@ -76,7 +76,6 @@ const FEATURE_FLAGS = {
     'longhornV2HugepageSettings',
     'staticIPForVM',
     'fsFreezeDeadline',
-    'highPerformanceStorage',
   ],
   'v1.9.1': [
     'lvmDmThinOnly',
diff --git a/pkg/harvester/mixins/harvester-vm/index.js b/pkg/harvester/mixins/harvester-vm/index.js
index 28f70ee0..d6b715ac 100644
--- a/pkg/harvester/mixins/harvester-vm/index.js
+++ b/pkg/harvester/mixins/harvester-vm/index.js
@@ -513,17 +513,10 @@ export default {
         }
 
         out.push({
-<<<<<<< HEAD
-          id:               randomStr(5),
-          source:           SOURCE_TYPE.IMAGE,
-          name:             'disk-0',
-          accessMode:       'ReadWriteMany', // root disk only support LHv1 volume, should be RWX
-=======
           id:                randomStr(5),
           source:            SOURCE_TYPE.IMAGE,
           name:              'disk-0',
-          accessMode:        READ_WRITE_MANY, // root disk only support LHv1 volume, should be RWX
->>>>>>> 528255d (feat: expose KubeVirt high-performance storage features in VM and Volume UI (#1133))
+          accessMode:        'ReadWriteMany', // root disk only support LHv1 volume, should be RWX
           bus,
           volumeName:        '',
           size,