fix: resolve backport conflict and keep highPerformanceStorage on v1.9.1

Keep the 'ReadWriteMany' literal for the root disk accessMode because
READ_WRITE_MANY is not defined in the mixin on release-harvester-v1.9,
and drop the duplicate v1.9.0 feature-flag entry added by the
cherry-pick; #1183 already gates highPerformanceStorage on v1.9.1.

Signed-off-by: Alejandro Bonilla <abonilla@suse.com>

pkg/harvester/config/feature-flags.js

@@ -76,7 +76,6 @@ const FEATURE_FLAGS = {
     'longhornV2HugepageSettings',
     'staticIPForVM',
     'fsFreezeDeadline',
-    'highPerformanceStorage',
   ],
   'v1.9.1': [
     'lvmDmThinOnly',

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))
           bus,
           volumeName:        '',
           size,