diff --git a/.github/mergify.yml b/.github/mergify.yml
new file mode 100644
index 00000000000..6897b57df0b
--- /dev/null
+++ b/.github/mergify.yml
@@ -0,0 +1,33 @@
+pull_request_rules:
+- name: Automatically open backport PR to release-harvester-v1.3
+  conditions:
+    - base=master
+    - label="Require backport v1.3"
+  actions:
+    backport:
+      branches:
+        - "release-harvester-v1.3"
+      assignees:
+        - "{{ author }}"
+      labels:
+        - "Backport to v1.3"
+
+- name: Automatically open backport PR to release-harvester-v1.4
+  conditions:
+    - base=master
+    - label="Require backport v1.4"
+  actions:
+    backport:
+      branches:
+        - "release-harvester-v1.4"
+      assignees:
+        - "{{ author }}"
+      labels:
+        - "Backport to v1.4"
+
+- name: Ask to resolve conflict
+  conditions:
+    - conflict
+  actions:
+    comment:
+      message: This pull request is now in conflict. Could you fix it @{{author}}? 🙏
\ No newline at end of file
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index f157f08f7e9..de3c518c60e 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -9,7 +9,11 @@
 - Are backend engineers aware of UI changes?
     - [ ] Yes, the backend owner is:
 
+<<<<<<< HEAD
 Fixes #
+=======
+Related Issue #
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 <!-- Define findings related to the feature or bug issue. -->
 
 ### Occurred changes and/or fixed issues
diff --git a/.github/workflows/check-plugins.yaml b/.github/workflows/check-plugins.yaml
index 0e11a682a77..d528d109831 100644
--- a/.github/workflows/check-plugins.yaml
+++ b/.github/workflows/check-plugins.yaml
@@ -13,7 +13,11 @@ jobs:
     - name: Setup Node.js
       uses: actions/setup-node@v2
       with:
+<<<<<<< HEAD
         node-version: '14.x'
+=======
+        node-version: '16.x'
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     - name: Validate Plugin build system
       run: ./shell/scripts/test-plugins-build.sh
       shell: bash
diff --git a/README.md b/README.md
index 20ea3e8f63a..b8152e26f45 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,10 @@
 # Harvester Dashboard
 
+<<<<<<< HEAD
 [![Build Status](http://drone-publish.rancher.io/api/badges/harvester/dashboard/status.svg)](http://drone-publish.rancher.io/harvester/dashboard)
 
+=======
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 Harvester Dashboard UI, Harvester is an open-source hyper-converged infrastructure (HCI) software built on Kubernetes.
 
 ## Running for Development
@@ -33,7 +36,11 @@ In this mode, you need to have Rancher and import Harvester, more detail in [Har
 yarn build-pkg harvester && yarn serve-pkgs
 
 # Open another terminal
+<<<<<<< HEAD
 HARVESTER_PKG_URL=http://127.0.0.1:4500/harvester-${version}/harvester-${version}.umd.min.js API=https://your-rancher-ip yarn mem-dev
+=======
+HARVESTER_PKG_URL=http://127.0.0.1:4500/harvester-${version}/harvester-${version}.umd.min.js API=https://your-rancher-ip RANCHER_ENV=harvester yarn mem-dev
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 # Example 
 # HARVESTER_PKG_URL=http://127.0.0.1:4500/harvester-1.2.0/harvester-1.2.0.umd.min.js API=https://192.168.1.122 yarn mem-dev
diff --git a/package.json b/package.json
index 4c90ba699c8..349905a9263 100644
--- a/package.json
+++ b/package.json
@@ -69,8 +69,13 @@
     "clipboard-polyfill": "4.0.1",
     "cookie": "0.5.0",
     "cookie-universal-nuxt": "2.1.4",
+<<<<<<< HEAD
     "cron-validator": "1.2.0",
     "cronstrue": "1.95.0",
+=======
+    "cron-validator": "1.3.1",
+    "cronstrue": "2.50.0",
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     "cross-env": "6.0.3",
     "d3": "7.3.0",
     "d3-selection": "1.4.1",
diff --git a/pkg/harvester/components/FilterVMSchedule.vue b/pkg/harvester/components/FilterVMSchedule.vue
new file mode 100644
index 00000000000..0cf6002a67b
--- /dev/null
+++ b/pkg/harvester/components/FilterVMSchedule.vue
@@ -0,0 +1,119 @@
+<script>
+import { RadioGroup } from '@components/Form/Radio';
+
+export default {
+  name: 'HarvesterFilterVMSchedule',
+
+  components: { RadioGroup },
+
+  props: {
+    rows: {
+      type:     Array,
+      required: true,
+    },
+  },
+
+  data() {
+    return { selected: '' };
+  },
+
+  computed: {
+    scheduleOptions() {
+      const options = this.rows.map(r => r.sourceSchedule).filter(r => r);
+
+      return Array.from(new Set(options));
+    },
+  },
+
+  methods: {
+    onSelect(selected) {
+      this.selected = selected;
+      this.filterRows();
+    },
+
+    remove() {
+      this.selected = '';
+      this.filterRows();
+    },
+
+    filterRows() {
+      if (!this.selected) {
+        this.$emit('change-rows', this.rows);
+
+        return;
+      }
+      const filteredRows = this.rows.filter(row => row.sourceSchedule === this.selected);
+
+      this.$emit('change-rows', filteredRows, this.selected);
+    }
+  },
+
+  watch: {
+    rows: {
+      deep:      true,
+      immediate: false,
+      handler() {
+        this.filterRows();
+      }
+    }
+  }
+};
+</script>
+
+<template>
+  <div class="vm-schedule-filter">
+    <template>
+      <span v-if="selected" class="banner-item bg-warning">
+        {{ t('harvester.tableHeaders.vmSchedule') }}{{ selected ? ` = ${selected}`: '' }}<i class="icon icon-close ml-5" @click="remove" />
+      </span>
+    </template>
+
+    <v-popover
+      :trigger="scheduleOptions.length ? 'click' : 'manual'"
+      placement="bottom-end"
+    >
+      <slot name="header">
+        <button ref="actionDropDown" class="btn bg-primary mr-10">
+          <slot name="title">
+            {{ t('harvester.fields.filterSchedule') }}
+          </slot>
+        </button>
+      </slot>
+      <template slot="popover">
+        <div class="filter-popup">
+          <RadioGroup
+            v-model="selected"
+            class="mr-10 ml-10"
+            name="model"
+            :options="scheduleOptions"
+            :labels="scheduleOptions"
+            @input="onSelect"
+          />
+        </div>
+      </template>
+    </v-popover>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.vm-schedule-filter {
+  display: inline-block;
+
+  .banner-item {
+    display: inline-block;
+    font-size: 16px;
+    margin-right: 10px;
+    padding: 6px;
+    border-radius: 2px;
+
+    i {
+      cursor: pointer;
+      vertical-align: middle;
+    }
+  }
+}
+.filter-popup {
+  width: max-content;
+}
+
+</style>
diff --git a/pkg/harvester/components/HarvesterUpgrade.vue b/pkg/harvester/components/HarvesterUpgrade.vue
index 9996a6e1dc8..f0fd1b4fb08 100644
--- a/pkg/harvester/components/HarvesterUpgrade.vue
+++ b/pkg/harvester/components/HarvesterUpgrade.vue
@@ -188,7 +188,11 @@ export default {
             <Checkbox v-model="readyReleaseNote" class="check" type="checkbox" label-key="harvester.upgradePage.checkReady" />
           </div>
 
+<<<<<<< HEAD
           <Banner v-if="errors.length" color="warning">
+=======
+          <Banner v-if="errors.length" color="error">
+>>>>>>> b5455bcb (fix: separate used/allocated units)
             {{ errors }}
           </Banner>
         </div>
diff --git a/pkg/harvester/components/SettingList.vue b/pkg/harvester/components/SettingList.vue
index b2bba63ea47..321e5f33db8 100644
--- a/pkg/harvester/components/SettingList.vue
+++ b/pkg/harvester/components/SettingList.vue
@@ -34,6 +34,7 @@ export default {
   },
 
   data() {
+<<<<<<< HEAD
     const categorySettings = this.settings.filter((s) => {
       if (this.category !== 'advanced') {
         return (CATEGORY[this.category] || []).find(item => item === s.id);
@@ -43,6 +44,9 @@ export default {
         return !allCategory.some(category => (CATEGORY[category] || []).find(item => item === s.id));
       }
     }) || [];
+=======
+    const categorySettings = this.filterCategorySettings();
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
     return {
       HCI_SETTING,
@@ -52,7 +56,31 @@ export default {
 
   computed: { ...mapGetters({ t: 'i18n/t' }) },
 
+<<<<<<< HEAD
   methods: {
+=======
+  watch: {
+    settings: {
+      deep: true,
+      handler() {
+        this.$set(this, 'categorySettings', this.filterCategorySettings());
+      }
+    }
+  },
+
+  methods: {
+    filterCategorySettings() {
+      return this.settings.filter((s) => {
+        if (this.category !== 'advanced') {
+          return (CATEGORY[this.category] || []).find(item => item === s.id);
+        } else if (this.category === 'advanced') {
+          const allCategory = Object.keys(CATEGORY);
+
+          return !allCategory.some(category => (CATEGORY[category] || []).find(item => item === s.id));
+        }
+      }) || [];
+    },
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     showActionMenu(e, setting) {
       const actionElement = e.srcElement;
 
@@ -112,6 +140,12 @@ export default {
             <span v-if="setting.customized" class="modified">
               Modified
             </span>
+<<<<<<< HEAD
+=======
+            <span v-if="setting.experimental" v-clean-tooltip="t('advancedSettings.experimental')" class="experimental">
+              Experimental
+            </span>
+>>>>>>> b5455bcb (fix: separate used/allocated units)
           </h1>
           <h2 v-clean-html="t(setting.description, {}, true)">
           </h2>
@@ -200,4 +234,15 @@ export default {
   padding: 2px 10px;
   font-size: 12px;
 }
+<<<<<<< HEAD
+=======
+
+.experimental {
+  margin-left: 10px;
+  border: 1px solid var(--error);
+  border-radius: 5px;
+  padding: 2px 10px;
+  font-size: 12px;
+}
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 </style>
diff --git a/pkg/harvester/components/UpgradeInfo.vue b/pkg/harvester/components/UpgradeInfo.vue
index 192eb406848..e70e400254d 100644
--- a/pkg/harvester/components/UpgradeInfo.vue
+++ b/pkg/harvester/components/UpgradeInfo.vue
@@ -1,5 +1,9 @@
 <script>
 import { Banner } from '@components/Banner';
+<<<<<<< HEAD
+=======
+import { DOC_LINKS } from '../config/doc-links';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 export default {
   name: 'HarvesterUpgradeInfo',
@@ -16,6 +20,13 @@ export default {
   computed: {
     releaseVersion() {
       return !!this.version ? `https://github.com/harvester/harvester/releases/tag/${ this.version }` : `https://github.com/harvester/harvester/releases`;
+<<<<<<< HEAD
+=======
+    },
+
+    upgradeLink() {
+      return DOC_LINKS.UPGRADE_URL;
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     }
   },
 };
@@ -26,15 +37,23 @@ export default {
     <Banner color="warning">
       <div>
         <strong>{{ t('harvester.upgradePage.upgradeInfo.warning') }}:</strong>
+<<<<<<< HEAD
         <p v-clean-html="t('harvester.upgradePage.upgradeInfo.doc', {}, true)" class="mb-5">
         </p>
+=======
+        <p v-clean-html="t('harvester.upgradePage.upgradeInfo.doc', {url: upgradeLink}, true)" class="mb-5"></p>
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
         <p class="mb-5">
           {{ t('harvester.upgradePage.upgradeInfo.tip') }}
         </p>
 
         <p class="mb-5">
+<<<<<<< HEAD
           {{ t('harvester.upgradePage.upgradeInfo.moreNotes') }} <a :href="releaseVersion" target="_blank">{{ t('generic.moreInfo') }} </a>
+=======
+          {{ t('harvester.upgradePage.upgradeInfo.moreNotes') }} <a :href="releaseVersion" target="_blank">{{ t('generic.moreInfo') }}</a>
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         </p>
       </div>
     </Banner>
diff --git a/pkg/harvester/components/novnc/NovncConsoleCustomKeys.vue b/pkg/harvester/components/novnc/NovncConsoleCustomKeys.vue
index fa46e51fa90..48f16659995 100644
--- a/pkg/harvester/components/novnc/NovncConsoleCustomKeys.vue
+++ b/pkg/harvester/components/novnc/NovncConsoleCustomKeys.vue
@@ -240,6 +240,10 @@ export default {
   .actions {
     width: 100%;
     display: flex;
+<<<<<<< HEAD
     justify-content: end;
+=======
+    justify-content: flex-end;
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   }
 </style>
diff --git a/pkg/harvester/components/settings/additional-guest-memory-overhead-ratio.vue b/pkg/harvester/components/settings/additional-guest-memory-overhead-ratio.vue
new file mode 100644
index 00000000000..c2441982f5a
--- /dev/null
+++ b/pkg/harvester/components/settings/additional-guest-memory-overhead-ratio.vue
@@ -0,0 +1,39 @@
+<script>
+import CreateEditView from '@shell/mixins/create-edit-view';
+import { LabeledInput } from '@components/Form/LabeledInput';
+
+export default {
+  name: 'AdditionalGuestMemoryOverheadRatio',
+
+  components: { LabeledInput },
+
+  mixins: [CreateEditView],
+
+  data() {
+    return { ratio: this.value.value || this.value.default };
+  },
+
+  methods: {
+    update() {
+      this.$set(this.value, 'value', this.ratio);
+    },
+
+    useDefault() {
+      this.$set(this, 'ratio', this.value.default);
+      this.update();
+    },
+  },
+};
+</script>
+
+<template>
+  <div class="row">
+    <div class="col span-12">
+      <LabeledInput
+        v-model="ratio"
+        :label="t('harvester.setting.ratio')"
+        @input="update"
+      />
+    </div>
+  </div>
+</template>
diff --git a/pkg/harvester/components/settings/csi-driver-config.vue b/pkg/harvester/components/settings/csi-driver-config.vue
index 02638fdd3bb..4ecc8fe388d 100644
--- a/pkg/harvester/components/settings/csi-driver-config.vue
+++ b/pkg/harvester/components/settings/csi-driver-config.vue
@@ -4,8 +4,12 @@ import LabeledSelect from '@shell/components/form/LabeledSelect';
 import InfoBox from '@shell/components/InfoBox';
 import { CSI_DRIVER, VOLUME_SNAPSHOT_CLASS } from '../../types';
 import { allHash } from '@shell/utils/promise';
+<<<<<<< HEAD
 
 const LONGHORN_DRIVER = 'driver.longhorn.io';
+=======
+import { LONGHORN_DRIVER } from '@shell/models/persistentvolume';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 export default {
   name: 'HarvesterCsiDriver',
diff --git a/pkg/harvester/components/settings/storage-network.vue b/pkg/harvester/components/settings/storage-network.vue
index 81af513614c..1231621b677 100644
--- a/pkg/harvester/components/settings/storage-network.vue
+++ b/pkg/harvester/components/settings/storage-network.vue
@@ -10,6 +10,10 @@ import Tip from '@shell/components/Tip';
 import { HCI } from '../../types';
 import { allHash } from '@shell/utils/promise';
 import { NODE } from '@shell/config/types';
+<<<<<<< HEAD
+=======
+import { DOC_LINKS } from '../../config/doc-links';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 export default {
   name: 'HarvesterEditStorageNetwork',
@@ -85,6 +89,12 @@ export default {
   },
 
   computed: {
+<<<<<<< HEAD
+=======
+    storageNetworkExampleLink() {
+      return DOC_LINKS.STORAGE_NETWORK_EXAMPLE;
+    },
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     clusterNetworkOptions() {
       const inStore = this.$store.getters['currentProduct'].inStore;
       const clusterNetworks = this.$store.getters[`${ inStore }/all`](HCI.CLUSTER_NETWORK) || [];
@@ -206,8 +216,13 @@ export default {
         :placeholder="t('harvester.setting.storageNetwork.range.placeholder')"
         label-key="harvester.setting.storageNetwork.range.label"
       />
+<<<<<<< HEAD
       <Tip class="mb-20" icon="icon icon-info" :text="t('harvester.setting.storageNetwork.tip')">
         <t k="harvester.setting.storageNetwork.tip" :raw="true" />
+=======
+      <Tip class="mb-20" icon="icon icon-info">
+        <t k="harvester.setting.storageNetwork.tip" :raw="true" :url="storageNetworkExampleLink" />
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       </Tip>
 
       <ArrayList
diff --git a/pkg/harvester/config/doc-links.js b/pkg/harvester/config/doc-links.js
new file mode 100644
index 00000000000..bb98fc2ea8c
--- /dev/null
+++ b/pkg/harvester/config/doc-links.js
@@ -0,0 +1,12 @@
+import { version } from '../package.json';
+import semver from 'semver';
+
+const docVersion = `v${ semver.major(version) }.${ semver.minor(version) }`;
+
+export const DOC_LINKS = {
+  CONSOLE_URL:             `https://docs.harvesterhci.io/${ docVersion }/host/#remote-console`,
+  RANCHER_INTEGRATION_URL: `https://docs.harvesterhci.io/${ docVersion }/rancher/rancher-integration`,
+  STORAGE_NETWORK_EXAMPLE: `https://docs.harvesterhci.io/${ docVersion }/advanced/storagenetwork#configuration-example`,
+  KSMTUNED_MODE:           `https://docs.harvesterhci.io/${ docVersion }/host/#ksmtuned-mode`,
+  UPGRADE_URL:             `https://docs.harvesterhci.io/${ docVersion }/upgrade/index`
+};
diff --git a/pkg/harvester/config/harvester-map.js b/pkg/harvester/config/harvester-map.js
index 04204e07019..185a792433d 100644
--- a/pkg/harvester/config/harvester-map.js
+++ b/pkg/harvester/config/harvester-map.js
@@ -23,7 +23,11 @@ export const InterfaceOption = [{
 
 export const SOURCE_TYPE = {
   NEW:           'New',
+<<<<<<< HEAD
   IMAGE:         'VM Image',
+=======
+  IMAGE:         'Virtual Machine Image',
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   ATTACH_VOLUME: 'Existing Volume',
   CONTAINER:     'Container'
 };
@@ -41,7 +45,18 @@ export const ACCESS_CREDENTIALS = {
   INJECT_SSH: 'sshPublicKey'
 };
 
+<<<<<<< HEAD
 export const RunStrategys = ['Always', 'RerunOnFailure', 'Manual', 'Halted'];
+=======
+export const runStrategies = ['Always', 'RerunOnFailure', 'Manual', 'Halted'];
+
+export const maintenanceStrategies = [
+  'Migrate',
+  'ShutdownAndRestartAfterEnable',
+  'ShutdownAndRestartAfterDisable',
+  'Shutdown'
+];
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 export const VOLUME_DATA_SOURCE_KIND = {
   VolumeSnapshot:        'VolumeSnapshot',
@@ -61,4 +76,17 @@ export const ADD_ONS = {
   RANCHER_LOGGING:                  'rancher-logging',
   RANCHER_MONITORING:               'rancher-monitoring',
   VM_IMPORT_CONTROLLER:             'vm-import-controller',
+<<<<<<< HEAD
+=======
+  LVM_DRIVER:                       'lvm.driver.harvesterhci.io'
+};
+
+export const CSI_SECRETS = {
+  CSI_PROVISIONER_SECRET_NAME:       'csi.storage.k8s.io/provisioner-secret-name',
+  CSI_PROVISIONER_SECRET_NAMESPACE:  'csi.storage.k8s.io/provisioner-secret-namespace',
+  CSI_NODE_PUBLISH_SECRET_NAME:      'csi.storage.k8s.io/node-publish-secret-name',
+  CSI_NODE_PUBLISH_SECRET_NAMESPACE: 'csi.storage.k8s.io/node-publish-secret-namespace',
+  CSI_NODE_STAGE_SECRET_NAME:        'csi.storage.k8s.io/node-stage-secret-name',
+  CSI_NODE_STAGE_SECRET_NAMESPACE:   'csi.storage.k8s.io/node-stage-secret-namespace',
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 };
diff --git a/pkg/harvester/config/harvester.js b/pkg/harvester/config/harvester.js
index 3d54eb0c1e8..d1c8eda4b92 100644
--- a/pkg/harvester/config/harvester.js
+++ b/pkg/harvester/config/harvester.js
@@ -28,6 +28,10 @@ import {
 
 import {
   IMAGE_DOWNLOAD_SIZE,
+<<<<<<< HEAD
+=======
+  IMAGE_VIRTUAL_SIZE,
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   FINGERPRINT,
   IMAGE_PROGRESS,
   SNAPSHOT_TARGET_VOLUME,
@@ -36,8 +40,13 @@ import {
 import { IF_HAVE } from '@shell/store/type-map';
 
 const TEMPLATE = HCI.VM_VERSION;
+<<<<<<< HEAD
 const MONITORING_GROUP = 'Monitoring & Logging::Monitoring';
 const LOGGING_GROUP = 'Monitoring & Logging::Logging';
+=======
+const MONITORING_GROUP = 'Monitoring and Logging::Monitoring';
+const LOGGING_GROUP = 'Monitoring and Logging::Logging';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 export const PRODUCT_NAME = 'harvester';
 
@@ -220,6 +229,10 @@ export function init($plugin, store) {
     NAMESPACE_COL,
     IMAGE_PROGRESS,
     IMAGE_DOWNLOAD_SIZE,
+<<<<<<< HEAD
+=======
+    IMAGE_VIRTUAL_SIZE,
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     AGE
   ]);
   virtualType({
@@ -235,6 +248,10 @@ export function init($plugin, store) {
     exact: false
   });
 
+<<<<<<< HEAD
+=======
+  // show Projects/Namespace nav when integrated in Rancher dashboard
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   basicType(['projects-namespaces']);
   virtualType({
     ifHave:     IF_HAVE.MULTI_CLUSTER,
@@ -418,6 +435,10 @@ export function init($plugin, store) {
 
   basicType(
     [
+<<<<<<< HEAD
+=======
+      HCI.SCHEDULE_VM_BACKUP,
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       HCI.BACKUP,
       HCI.SNAPSHOT,
       HCI.VM_SNAPSHOT,
@@ -439,6 +460,10 @@ export function init($plugin, store) {
       HCI.PCI_DEVICE,
       HCI.SR_IOVGPU_DEVICE,
       HCI.VGPU_DEVICE,
+<<<<<<< HEAD
+=======
+      HCI.USB_DEVICE,
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       HCI.ADD_ONS,
       HCI.SECRET,
       HCI.SETTING
@@ -464,6 +489,23 @@ export function init($plugin, store) {
     exact: false
   });
 
+<<<<<<< HEAD
+=======
+  configureType(HCI.SCHEDULE_VM_BACKUP, { showListMasthead: false, showConfigView: false });
+  virtualType({
+    labelKey:   'harvester.schedule.label',
+    name:       HCI.SCHEDULE_VM_BACKUP,
+    namespaced: true,
+    weight:     201,
+    route:      {
+      name:   `${ PRODUCT_NAME }-c-cluster-resource`,
+      params: { resource: HCI.SCHEDULE_VM_BACKUP }
+    },
+    exact:      false,
+    ifHaveType: HCI.SCHEDULE_VM_BACKUP,
+  });
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   configureType(HCI.BACKUP, { showListMasthead: false, showConfigView: false });
   virtualType({
     labelKey:   'harvester.backup.label',
@@ -772,6 +814,44 @@ export function init($plugin, store) {
     ]
   });
 
+<<<<<<< HEAD
+=======
+  virtualType({
+    labelKey:   'harvester.usb.label',
+    group:      'advanced',
+    weight:     11,
+    name:       HCI.USB_DEVICE,
+    namespaced: false,
+    route:      {
+      name:   `${ PRODUCT_NAME }-c-cluster-resource`,
+      params: { resource: HCI.USB_DEVICE }
+    },
+    exact:      false,
+    ifHaveType: HCI.USB_DEVICE,
+  });
+
+  configureType(HCI.USB_DEVICE, {
+    isCreatable:                false,
+    hiddenNamespaceGroupButton: true,
+    listGroups:                 [
+      {
+        icon:       'icon-list-grouped',
+        value:      'description',
+        field:      'groupByDevice',
+        hideColumn: 'description',
+        tooltipKey: 'resourceTable.groupBy.device'
+      },
+      {
+        icon:       'icon-cluster',
+        value:      'node',
+        field:      'groupByNode',
+        hideColumn: 'node',
+        tooltipKey: 'resourceTable.groupBy.node'
+      }
+    ]
+  });
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   configureType(HCI.ADD_ONS, {
     isCreatable: false,
     isRemovable: false,
@@ -779,7 +859,11 @@ export function init($plugin, store) {
   });
 
   virtualType({
+<<<<<<< HEAD
     label:      'Addons',
+=======
+    label:      'Add-ons',
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     group:      'advanced',
     name:       HCI.ADD_ONS,
     ifHaveType: HCI.ADD_ONS,
diff --git a/pkg/harvester/config/labels-annotations.js b/pkg/harvester/config/labels-annotations.js
index b1fc3e46820..be64ab8154e 100644
--- a/pkg/harvester/config/labels-annotations.js
+++ b/pkg/harvester/config/labels-annotations.js
@@ -1,7 +1,10 @@
 export const HCI = {
   CLOUD_INIT:                     'harvesterhci.io/cloud-init-template',
   CURRENT_IP:                     'rke2.io/internal-ip',
+<<<<<<< HEAD
   OWNED_BY:                       'harvesterhci.io/owned-by',
+=======
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   IMAGE_ID:                       'harvesterhci.io/imageId',
   SSH_NAMES:                      'harvesterhci.io/sshNames',
   NETWORK_IPS:                    'network.harvesterhci.io/ips',
@@ -54,4 +57,9 @@ export const HCI = {
   NODE_CPU_MANAGER_UPDATE_STATUS: 'harvesterhci.io/cpu-manager-update-status',
   CPU_MANAGER:                    'cpumanager',
   VM_DEVICE_ALLOCATION_DETAILS:   'harvesterhci.io/deviceAllocationDetails',
+<<<<<<< HEAD
+=======
+  SVM_BACKUP_ID:                  'harvesterhci.io/svmbackupId',
+  DISABLE_LONGHORN_V2_ENGINE:     'node.longhorn.io/disable-v2-data-engine'
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 };
diff --git a/pkg/harvester/config/settings.js b/pkg/harvester/config/settings.js
index 9822838c970..80cda161e84 100644
--- a/pkg/harvester/config/settings.js
+++ b/pkg/harvester/config/settings.js
@@ -31,7 +31,13 @@ export const HCI_SETTING = {
   VM_TERMINATION_PERIOD:                  'default-vm-termination-grace-period-seconds',
   NTP_SERVERS:                            'ntp-servers',
   AUTO_ROTATE_RKE2_CERTS:                 'auto-rotate-rke2-certs',
+<<<<<<< HEAD
   KUBECONFIG_DEFAULT_TOKEN_TTL_MINUTES:   'kubeconfig-default-token-ttl-minutes'
+=======
+  KUBECONFIG_DEFAULT_TOKEN_TTL_MINUTES:   'kubeconfig-default-token-ttl-minutes',
+  LONGHORN_V2_DATA_ENGINE_ENABLED:        'longhorn-v2-data-engine-enabled',
+  ADDITIONAL_GUEST_MEMORY_OVERHEAD_RATIO: 'additional-guest-memory-overhead-ratio'
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 };
 
 export const HCI_ALLOWED_SETTINGS = {
@@ -82,7 +88,13 @@ export const HCI_ALLOWED_SETTINGS = {
   [HCI_SETTING.NTP_SERVERS]:           {
     kind: 'json', from: 'import', canReset: true
   },
+<<<<<<< HEAD
   [HCI_SETTING.KUBECONFIG_DEFAULT_TOKEN_TTL_MINUTES]: {},
+=======
+  [HCI_SETTING.KUBECONFIG_DEFAULT_TOKEN_TTL_MINUTES]:   {},
+  [HCI_SETTING.LONGHORN_V2_DATA_ENGINE_ENABLED]:        { kind: 'boolean', experimental: true },
+  [HCI_SETTING.ADDITIONAL_GUEST_MEMORY_OVERHEAD_RATIO]: { kind: 'string', from: 'import' },
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 };
 
 export const HCI_SINGLE_CLUSTER_ALLOWED_SETTING = {
diff --git a/pkg/harvester/config/table-headers.js b/pkg/harvester/config/table-headers.js
index ecd7afa808c..5981b984c7f 100644
--- a/pkg/harvester/config/table-headers.js
+++ b/pkg/harvester/config/table-headers.js
@@ -8,7 +8,17 @@ export const IMAGE_DOWNLOAD_SIZE = {
   labelKey: 'tableHeaders.size',
   value:    'downSize',
   sort:     'status.size',
+<<<<<<< HEAD
   width:    120
+=======
+};
+
+export const IMAGE_VIRTUAL_SIZE = {
+  name:     'virtualSize',
+  labelKey: 'harvester.tableHeaders.virtualSize',
+  value:    'virtualSize',
+  sort:     'status.virtualSize',
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 };
 
 export const IMAGE_PROGRESS = {
@@ -34,3 +44,43 @@ export const SNAPSHOT_TARGET_VOLUME = {
   sort:      'spec.source.persistentVolumeClaimName',
   formatter: 'SnapshotTargetVolume',
 };
+<<<<<<< HEAD
+=======
+
+// The column of cron expression volume on VM schedules list page
+export const VM_SCHEDULE_CRON = {
+  name:      'CronExpression',
+  labelKey:  'harvester.tableHeaders.cronExpression',
+  value:     'spec.cron',
+  align:     'center',
+  sort:      'spec.cron',
+  formatter: 'HarvesterCronExpression',
+};
+
+// The column of retain on VM schedules list page
+export const VM_SCHEDULE_RETAIN = {
+  name:     'Retain',
+  labelKey: 'harvester.tableHeaders.retain',
+  value:    'spec.retain',
+  sort:     'spec.retain',
+  align:    'center',
+};
+
+// The column of maxFailure on VM schedules list page
+export const VM_SCHEDULE_MAX_FAILURE = {
+  name:     'MaxFailure',
+  labelKey: 'harvester.tableHeaders.maxFailure',
+  value:    'spec.maxFailure',
+  sort:     'spec.maxFailure',
+  align:    'center',
+};
+
+// The column of type on VM schedules list page
+export const VM_SCHEDULE_TYPE = {
+  name:     'Type',
+  labelKey: 'harvester.tableHeaders.scheduleType',
+  value:    'spec.vmbackup.type',
+  sort:     'spec.vmbackup.type',
+  align:    'center',
+};
+>>>>>>> b5455bcb (fix: separate used/allocated units)
diff --git a/pkg/harvester/detail/harvesterhci.io.host/HarvesterHostBasic.vue b/pkg/harvester/detail/harvesterhci.io.host/HarvesterHostBasic.vue
index 28d9f486922..06c346964f8 100644
--- a/pkg/harvester/detail/harvesterhci.io.host/HarvesterHostBasic.vue
+++ b/pkg/harvester/detail/harvesterhci.io.host/HarvesterHostBasic.vue
@@ -48,6 +48,16 @@ export default {
     customName() {
       return this.value.metadata?.annotations?.[HCI_ANNOTATIONS.HOST_CUSTOM_NAME];
     },
+<<<<<<< HEAD
+=======
+    cpuManagerStatus() {
+      if (this.value.isCPUManagerEnableInProgress) {
+        return this.t('generic.loading');
+      }
+
+      return this.t(`generic.${ this.value.isCPUManagerEnabled ? 'enabled' : 'disabled' }`);
+    },
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
     consoleUrl() {
       const consoleUrl = this.value.metadata?.annotations?.[HCI_ANNOTATIONS.HOST_CONSOLE_URL];
@@ -224,6 +234,12 @@ export default {
     </div>
 
     <div class="row mb-20">
+<<<<<<< HEAD
+=======
+      <div v-if="!value.isEtcd" class="col span-6">
+        <LabelValue :name="t('harvester.host.detail.cpuManager')" :value="cpuManagerStatus" />
+      </div>
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       <div class="col span-6">
         <LabelValue :name="t('harvester.host.detail.consoleUrl')" :value="consoleUrl.value">
           <a slot="value" :href="consoleUrl.value" target="_blank">{{ consoleUrl.display }}</a>
diff --git a/pkg/harvester/detail/harvesterhci.io.host/HarvesterHostDisk.vue b/pkg/harvester/detail/harvesterhci.io.host/HarvesterHostDisk.vue
index 93c4821a6b7..44c36961732 100644
--- a/pkg/harvester/detail/harvesterhci.io.host/HarvesterHostDisk.vue
+++ b/pkg/harvester/detail/harvesterhci.io.host/HarvesterHostDisk.vue
@@ -6,6 +6,11 @@ import { Banner } from '@components/Banner';
 import HarvesterDisk from '../../mixins/harvester-disk';
 import { RadioGroup } from '@components/Form/Radio';
 
+<<<<<<< HEAD
+=======
+import { LONGHORN_VERSION_V1 } from '@shell/models/persistentvolume';
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 export default {
   components: {
     LabelValue,
@@ -84,6 +89,23 @@ export default {
         return '';
       }
     },
+<<<<<<< HEAD
+=======
+
+    provisioner() {
+      let labelKey = `harvester.host.disk.storage.longhorn.${ LONGHORN_VERSION_V1 }.label`;
+
+      if (this.value?.blockDevice?.spec?.provisioner.longhorn) {
+        labelKey = `harvester.host.disk.storage.longhorn.${ this.value.blockDevice.spec.provisioner.longhorn.engineVersion }.label`;
+      }
+
+      if (this.value?.blockDevice?.spec?.provisioner.lvm) {
+        labelKey = 'harvester.host.disk.storage.lvm.label';
+      }
+
+      return this.t(labelKey);
+    }
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   },
   methods: {
     update() {
@@ -196,12 +218,25 @@ export default {
           :value="value.displayName"
         />
       </div>
+<<<<<<< HEAD
       <div class="col span-4">
+=======
+      <div v-if="value.path" class="col span-4">
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         <LabelValue
           :name="t('harvester.host.disk.path.label')"
           :value="value.path"
         />
       </div>
+<<<<<<< HEAD
+=======
+      <div class="col span-4">
+        <LabelValue
+          :name="t('harvester.host.disk.provisioner')"
+          :value="provisioner"
+        />
+      </div>
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     </div>
   </div>
 </template>
diff --git a/pkg/harvester/detail/harvesterhci.io.host/index.vue b/pkg/harvester/detail/harvesterhci.io.host/index.vue
index 8bd8c34467c..02fd54008a4 100644
--- a/pkg/harvester/detail/harvesterhci.io.host/index.vue
+++ b/pkg/harvester/detail/harvesterhci.io.host/index.vue
@@ -103,11 +103,18 @@ export default {
 
     const blockDevices = this.$store.getters[`${ inStore }/all`](HCI.BLOCK_DEVICE);
     const provisionedBlockDevices = blockDevices.filter((d) => {
+<<<<<<< HEAD
       const provisioned = d?.spec?.fileSystem?.provisioned;
       const isCurrentNode = d?.spec?.nodeName === this.value.id;
       const isLonghornMounted = findBy(this.longhornDisks, 'name', d.metadata.name);
 
       return provisioned && isCurrentNode && !isLonghornMounted;
+=======
+      const isCurrentNode = d?.spec?.nodeName === this.value.id;
+      const isLonghornMounted = findBy(this.longhornDisks, 'name', d.metadata.name);
+
+      return d?.isProvisioned && isCurrentNode && !isLonghornMounted;
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     })
       .map((d) => {
         return {
diff --git a/pkg/harvester/detail/harvesterhci.io.schedulevmbackup/BackupList.vue b/pkg/harvester/detail/harvesterhci.io.schedulevmbackup/BackupList.vue
new file mode 100644
index 00000000000..1ae77e55bf0
--- /dev/null
+++ b/pkg/harvester/detail/harvesterhci.io.schedulevmbackup/BackupList.vue
@@ -0,0 +1,130 @@
+<script>
+import ResourceTable from '@shell/components/ResourceTable';
+import { STATE, NAME, AGE } from '@shell/config/table-headers';
+import { allSettled } from '../../utils/promise';
+import { BACKUP_TYPE } from '../../config/types';
+import { HCI } from '../../types';
+import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
+
+export default {
+  name: 'BackupList',
+
+  components: { ResourceTable },
+
+  props: {
+    id: {
+      type:     String,
+      required: true,
+    },
+  },
+  async fetch() {
+    const inStore = this.$store.getters['currentProduct'].inStore;
+    const hash = await allSettled({ backups: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.BACKUP }) });
+
+    this.rows = hash.backups;
+  },
+
+  data() {
+    const inStore = this.$store.getters['currentProduct'].inStore;
+    const schema = this.$store.getters[`${ inStore }/schemaFor`](HCI.BACKUP);
+
+    return {
+      rows: [],
+      schema
+    };
+  },
+
+  computed: {
+    headers() {
+      const cols = [
+        STATE,
+        {
+          ...NAME,
+          width: 400
+        },
+        {
+          name:      'targetVM',
+          labelKey:  'tableHeaders.targetVm',
+          value:     'attachVM',
+          align:     'left',
+          sort:      'attachVM',
+          formatter: 'AttachVMWithName'
+        },
+        {
+          name:      'backupTarget',
+          labelKey:  'tableHeaders.backupTarget',
+          value:     'backupTarget',
+          sort:      'backupTarget',
+          align:     'left',
+          formatter: 'HarvesterBackupTargetValidation'
+        },
+        {
+          name:      'readyToUse',
+          labelKey:  'tableHeaders.readyToUse',
+          value:     'status.readyToUse',
+          sort:      'status.readyToUse',
+          align:     'center',
+          formatter: 'Checked',
+        },
+      ];
+
+      if (this.hasBackupProgresses) {
+        cols.push({
+          name:      'backupProgress',
+          labelKey:  'tableHeaders.progress',
+          value:     'backupProgress',
+          sort:      'backupProgress',
+          align:     'left',
+          formatter: 'HarvesterBackupProgressBar',
+        });
+      }
+      cols.push(AGE);
+
+      return cols;
+    },
+
+    hasBackupProgresses() {
+      return !!this.rows.find(R => R.status?.progress !== undefined);
+    },
+
+    filteredRows() {
+      let r = this.rows.filter(row => row.spec?.type === BACKUP_TYPE.BACKUP);
+
+      if (this.id) {
+        r = r.filter(backup => backup.metadata.annotations?.[HCI_ANNOTATIONS.SVM_BACKUP_ID] === this.id);
+      }
+
+      return r;
+    },
+  },
+};
+</script>
+
+<template>
+  <ResourceTable
+    v-bind="$attrs"
+    :headers="headers"
+    :groupable="false"
+    :rows="filteredRows"
+    :schema="schema"
+    key-field="_key"
+    default-sort-by="age"
+    v-on="$listeners"
+  >
+    <template #col:name="{row}">
+      <td>
+        <span>
+          <n-link
+            v-if="row?.status?.source"
+            :to="row.detailLocation"
+          >
+            {{ row.nameDisplay }}
+          </n-link>
+          <span v-else>
+            {{ row.nameDisplay }}
+          </span>
+        </span>
+      </td>
+    </template>
+  </ResourceTable>
+</template>
diff --git a/pkg/harvester/detail/harvesterhci.io.schedulevmbackup/SnapshotList.vue b/pkg/harvester/detail/harvesterhci.io.schedulevmbackup/SnapshotList.vue
new file mode 100644
index 00000000000..9fa3111dcc0
--- /dev/null
+++ b/pkg/harvester/detail/harvesterhci.io.schedulevmbackup/SnapshotList.vue
@@ -0,0 +1,98 @@
+<script>
+import ResourceTable from '@shell/components/ResourceTable';
+import { STATE, NAME, AGE } from '@shell/config/table-headers';
+import { allSettled } from '../../utils/promise';
+import { BACKUP_TYPE } from '../../config/types';
+import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
+import { HCI } from '../../types';
+import { schema } from '../../list/harvesterhci.io.vmsnapshot';
+
+export default {
+  name: 'SnapshotList',
+
+  components: { ResourceTable },
+
+  props: {
+
+    id: {
+      type:     String,
+      required: true,
+    },
+  },
+  async fetch() {
+    const hash = await allSettled({ backups: this.$store.dispatch('harvester/findAll', { type: HCI.BACKUP }) });
+
+    this.rows = hash.backups;
+  },
+
+  data() {
+    return {
+      rows: [],
+      schema
+    };
+  },
+
+  computed: {
+    headers() {
+      return [
+        STATE,
+        NAME,
+        {
+          name:      'targetVM',
+          labelKey:  'tableHeaders.targetVm',
+          value:     'attachVM',
+          align:     'left',
+          formatter: 'AttachVMWithName'
+        },
+        {
+          name:      'readyToUse',
+          labelKey:  'tableHeaders.readyToUse',
+          value:     'status.readyToUse',
+          align:     'center',
+          formatter: 'Checked',
+        },
+        AGE
+      ];
+    },
+
+    filteredRows() {
+      let r = this.rows.filter(row => row.spec?.type === BACKUP_TYPE.SNAPSHOT);
+
+      if (this.id) {
+        r = r.filter(row => row.metadata.annotations?.[HCI_ANNOTATIONS.SVM_BACKUP_ID] === this.id);
+      }
+
+      return r;
+    },
+  },
+};
+</script>
+
+<template>
+  <ResourceTable
+    v-bind="$attrs"
+    :headers="headers"
+    :groupable="false"
+    :rows="filteredRows"
+    :schema="schema"
+    key-field="_key"
+    default-sort-by="age"
+    v-on="$listeners"
+  >
+    <template #col:name="{row}">
+      <td>
+        <span>
+          <n-link
+            v-if="row?.status?.source"
+            :to="row.detailLocation"
+          >
+            {{ row.nameDisplay }}
+          </n-link>
+          <span v-else>
+            {{ row.nameDisplay }}
+          </span>
+        </span>
+      </td>
+    </template>
+  </ResourceTable>
+</template>
diff --git a/pkg/harvester/detail/harvesterhci.io.schedulevmbackup/index.vue b/pkg/harvester/detail/harvesterhci.io.schedulevmbackup/index.vue
new file mode 100644
index 00000000000..274bcf5eefd
--- /dev/null
+++ b/pkg/harvester/detail/harvesterhci.io.schedulevmbackup/index.vue
@@ -0,0 +1,125 @@
+<script>
+import LabelValue from '@shell/components/LabelValue';
+import Tabbed from '@shell/components/Tabbed';
+import Tab from '@shell/components/Tabbed/Tab';
+import { BACKUP_TYPE } from '../../config/types';
+import BackupList from './BackupList';
+import SnapshotList from './SnapshotList';
+import cronstrue from 'cronstrue';
+
+export default {
+  name:       'ScheduleVmBackupDetail',
+  components: {
+    BackupList,
+    SnapshotList,
+    Tab,
+    Tabbed,
+    LabelValue,
+  },
+
+  props: {
+    value: {
+      type:     Object,
+      required: true,
+    },
+  },
+
+  computed: {
+    isBackup() {
+      return this.value.spec.vmbackup.type === BACKUP_TYPE.BACKUP;
+    },
+    isSnapshot() {
+      return this.value.spec.vmbackup.type === BACKUP_TYPE.SNAPSHOT;
+    },
+    cronExpression() {
+      let cronHint = '';
+
+      try {
+        cronHint = cronstrue.toString(this.value.spec.cron, { verbose: true });
+      } catch (e) {
+        cronHint = this.t('generic.invalidCron');
+      }
+
+      return cronHint ? `${ this.value.spec.cron } (${ cronHint })` : this.value.spec.cron;
+    }
+  }
+};
+</script>
+
+<template>
+  <Tabbed v-bind="$attrs" class="mt-15" :side-tabs="true">
+    <Tab
+      name="basic"
+      :label="t('harvester.virtualMachine.detail.tabs.basics')"
+      class="bordered-table"
+      :weight="99"
+    >
+      <div class="row">
+        <div class="col span-6 mb-20">
+          <LabelValue
+            :name="t('harvester.schedule.detail.namespace')"
+            :value="value.metadata.namespace"
+          />
+        </div>
+        <div class="col span-6 mb-20">
+          <LabelValue
+            :name="t('harvester.schedule.detail.sourceVM')"
+            :value="value.spec.vmbackup.source.name"
+          />
+        </div>
+      </div>
+      <div class="row">
+        <div class="col span-6 mb-20">
+          <LabelValue
+            :name="t('harvester.schedule.cron')"
+            :value="cronExpression"
+          />
+        </div>
+        <div class="col span-6 mb-20">
+          <LabelValue
+            :name="t('harvester.schedule.scheduleType')"
+            :value="value.spec.vmbackup.type"
+          />
+        </div>
+      </div>
+      <div class="row">
+        <div class="col span-6 mb-20">
+          <LabelValue
+            :name="t('harvester.schedule.retain.label')"
+            :value="value.spec.retain"
+          />
+        </div>
+        <div class="col span-6 mb-20">
+          <LabelValue
+            :name="t('harvester.schedule.maxFailure.label')"
+            :value="value.spec.maxFailure"
+          />
+        </div>
+      </div>
+    </Tab>
+    <Tab
+      v-if="isBackup"
+      name="backups"
+      :label="t('harvester.schedule.tabs.backups')"
+      :weight="89"
+      class="bordered-table"
+    >
+      <BackupList :id="value.id" />
+    </Tab>
+    <Tab
+      v-if="isSnapshot"
+      name="snapshots"
+      :label="t('harvester.schedule.tabs.snapshots')"
+      :weight="79"
+      class="bordered-table"
+    >
+      <SnapshotList :id="value.id" />
+    </Tab>
+  </Tabbed>
+</template>
+
+<style lang="scss" scoped>
+.error {
+  color: var(--error);
+}
+</style>
diff --git a/pkg/harvester/detail/harvesterhci.io.virtualmachinebackup/index.vue b/pkg/harvester/detail/harvesterhci.io.virtualmachinebackup/index.vue
index f97206f2b42..0a405409e96 100644
--- a/pkg/harvester/detail/harvesterhci.io.virtualmachinebackup/index.vue
+++ b/pkg/harvester/detail/harvesterhci.io.virtualmachinebackup/index.vue
@@ -127,16 +127,25 @@ export default {
     <Tabbed v-if="spec" :side-tabs="true" @changed="onTabChanged">
       <Tab name="Basics" :label="t('harvester.virtualMachine.detail.tabs.basics')">
         <div class="row">
+<<<<<<< HEAD
           <div class="col span-6">
             <LabelValue :name="t('harvester.virtualMachine.detail.details.name')" :value="name" />
           </div>
 
           <div class="col span-6">
+=======
+          <div class="col span-6 mb-20">
+            <LabelValue :name="t('harvester.virtualMachine.detail.details.name')" :value="name" />
+          </div>
+
+          <div class="col span-6 mb-20">
+>>>>>>> b5455bcb (fix: separate used/allocated units)
             <LabelValue :name="t('harvester.fields.image')" :value="imageName" />
           </div>
         </div>
 
         <div class="row">
+<<<<<<< HEAD
           <div class="col span-6">
             <LabelValue :name="t('harvester.virtualMachine.detail.details.hostname')" :value="hostname" />
           </div>
@@ -150,6 +159,21 @@ export default {
 
         <div class="row">
           <div class="col span-6">
+=======
+          <div class="col span-6 mb-20">
+            <LabelValue :name="t('harvester.virtualMachine.detail.details.hostname')" :value="hostname" />
+          </div>
+
+          <div class="col span-6 mb-20">
+            <LabelValue :name="t('harvester.virtualMachine.input.MachineType')" :value="machineType" />
+          </div>
+        </div>
+        <div class="mb-20">
+          <CpuMemory :cpu="cpu" :mode="mode" :memory="memory" />
+        </div>
+        <div class="row">
+          <div class="col span-6 mb-20">
+>>>>>>> b5455bcb (fix: separate used/allocated units)
             <LabelValue :name="t('harvester.virtualMachine.detail.details.bootOrder')">
               <template #value>
                 <div>
@@ -162,7 +186,11 @@ export default {
               </template>
             </LabelValue>
           </div>
+<<<<<<< HEAD
           <div class="col span-6">
+=======
+          <div class="col span-6 mb-20">
+>>>>>>> b5455bcb (fix: separate used/allocated units)
             <LabelValue :name="t('harvester.virtualMachine.detail.details.CDROMs')">
               <template #value>
                 <div>
@@ -180,7 +208,10 @@ export default {
           </div>
         </div>
       </Tab>
+<<<<<<< HEAD
 
+=======
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       <Tab
         name="volume"
         :label="t('harvester.tab.volume')"
diff --git a/pkg/harvester/detail/harvesterhci.io.virtualmachineimage/index.vue b/pkg/harvester/detail/harvesterhci.io.virtualmachineimage/index.vue
index fcb523d3a15..0dd66b443e0 100644
--- a/pkg/harvester/detail/harvesterhci.io.virtualmachineimage/index.vue
+++ b/pkg/harvester/detail/harvesterhci.io.virtualmachineimage/index.vue
@@ -2,13 +2,24 @@
 import CopyToClipboardText from '@shell/components/CopyToClipboardText';
 import LabelValue from '@shell/components/LabelValue';
 import { DESCRIPTION } from '@shell/config/labels-annotations';
+<<<<<<< HEAD
 import { HCI } from '@pkg/harvester/config/labels-annotations';
+=======
+import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
+import { HCI } from '../../types';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 import Tabbed from '@shell/components/Tabbed';
 import Tab from '@shell/components/Tabbed/Tab';
 import { findBy } from '@shell/utils/array';
 import { get } from '@shell/utils/object';
+<<<<<<< HEAD
 
 import Storage from './Storage';
+=======
+import { ucFirst } from '@shell/utils/string';
+import Storage from './Storage';
+import { SECRET } from '@shell/config/types';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 export default {
   components: {
@@ -26,8 +37,23 @@ export default {
     },
   },
 
+<<<<<<< HEAD
   data() {
     return {};
+=======
+  async fetch() {
+    const inStore = this.$store.getters['currentProduct'].inStore;
+
+    this.secrets = await this.$store.dispatch(`${ inStore }/findAll`, { type: SECRET });
+    this.images = await this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.IMAGE });
+  },
+
+  data() {
+    return {
+      secrets: [],
+      images:  []
+    };
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   },
 
   computed: {
@@ -35,6 +61,13 @@ export default {
       return this.value?.downSize;
     },
 
+<<<<<<< HEAD
+=======
+    virtualSize() {
+      return this.value?.virtualSize;
+    },
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     url() {
       return this.value?.spec?.url || '-';
     },
@@ -53,8 +86,56 @@ export default {
       return this.value?.spec?.sourceType === 'upload';
     },
 
+<<<<<<< HEAD
     imageName() {
       return this.value?.metadata?.annotations?.[HCI.IMAGE_NAME] || '-';
+=======
+    sourceImage() {
+      const { sourceImageName, sourceImageNamespace } = this.value?.spec?.securityParameters || {};
+
+      if (sourceImageNamespace && sourceImageName) {
+        const imageId = `${ sourceImageNamespace }/${ sourceImageName }`;
+
+        return this.images.find(image => image.id === imageId);
+      }
+
+      return null;
+    },
+
+    sourceImageLink() {
+      return this.sourceImage?.detailLocation;
+    },
+
+    sourceImageId() {
+      if (this.sourceImage) {
+        return this.sourceImage.displayNameWithNamespace;
+      }
+
+      return '';
+    },
+
+    isEncryptedOrDecrypted() {
+      return ['encrypt', 'decrypt'].includes(this.value?.spec?.securityParameters?.cryptoOperation);
+    },
+
+    encryptionSecret() {
+      if (!this.value.isEncrypted) {
+        return '-';
+      }
+
+      return this.value.encryptionSecret;
+    },
+    secretLink() {
+      return this.secrets.find(sc => sc.id === this.value.encryptionSecret)?.detailLocation;
+    },
+
+    isEncryptedString() {
+      return ucFirst(String(this.value.isEncrypted));
+    },
+
+    imageName() {
+      return this.value?.metadata?.annotations?.[HCI_ANNOTATIONS.IMAGE_NAME] || '-';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     },
   }
 };
@@ -102,10 +183,62 @@ export default {
 
       <div class="row">
         <div class="col span-12">
+<<<<<<< HEAD
+=======
+          <LabelValue :name="t('harvester.image.virtualSize')" :value="virtualSize" class="mb-20" />
+        </div>
+      </div>
+
+      <div class="row">
+        <div class="col span-12">
+>>>>>>> b5455bcb (fix: separate used/allocated units)
           <LabelValue :name="t('nameNsDescription.description.label')" :value="description" class="mb-20" />
         </div>
       </div>
 
+<<<<<<< HEAD
+=======
+      <div class="row">
+        <div class="col span-12">
+          <LabelValue :name="t('harvester.image.isEncryption')" :value="isEncryptedString" class="mb-20" />
+        </div>
+      </div>
+
+      <div v-if="value.isEncrypted" class="row mb-20">
+        <div class="col span-12">
+          <div class="text-label">
+            {{ t('harvester.image.encryptionSecret') }}
+          </div>
+          <n-link v-if="encryptionSecret && secretLink" :to="secretLink">
+            {{ encryptionSecret }}
+          </n-link>
+          <span v-else-if="encryptionSecret">
+            {{ encryptionSecret }}
+          </span>
+          <span v-else class="text-muted">
+            &mdash;
+          </span>
+        </div>
+      </div>
+
+      <div v-if="isEncryptedOrDecrypted" class="row mb-20">
+        <div class="col span-12">
+          <div class="text-label">
+            {{ t('harvester.image.sourceImage') }}
+          </div>
+          <n-link v-if="sourceImageId && sourceImageLink" :to="sourceImageLink">
+            {{ sourceImageId }}
+          </n-link>
+          <span v-else-if="sourceImageId">
+            {{ sourceImageId }}
+          </span>
+          <span v-else class="text-muted">
+            &mdash;
+          </span>
+        </div>
+      </div>
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       <div v-if="errorMessage !== '-'" class="row">
         <div class="col span-12">
           <div>
diff --git a/pkg/harvester/detail/kubevirt.io.virtualmachine/VirtualMachineTabs/VirtualMachineBasics.vue b/pkg/harvester/detail/kubevirt.io.virtualmachine/VirtualMachineTabs/VirtualMachineBasics.vue
index ed572523a2c..19275062831 100644
--- a/pkg/harvester/detail/kubevirt.io.virtualmachine/VirtualMachineTabs/VirtualMachineBasics.vue
+++ b/pkg/harvester/detail/kubevirt.io.virtualmachine/VirtualMachineTabs/VirtualMachineBasics.vue
@@ -63,10 +63,14 @@ export default {
 
     imageName() {
       const imageList = this.$store.getters['harvester/all'](HCI.IMAGE) || [];
+<<<<<<< HEAD
 
       const image = imageList.find( (I) => {
         return this.value.rootImageId === I.id;
       });
+=======
+      const image = imageList.find( I => this.value.rootImageId === I.id);
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
       return image?.spec?.displayName || 'N/A';
     },
@@ -136,6 +140,7 @@ export default {
 </script>
 
 <template>
+<<<<<<< HEAD
   <div class="overview-basics">
     <div class="row">
       <div class="col span-6">
@@ -237,6 +242,111 @@ export default {
 
       <div class="col span-6">
         <LabelValue :name="t('harvester.virtualMachine.input.MachineType')" :value="machineType" />
+=======
+  <div>
+    <VMConsoleBar :resource="value" class="consoleBut" />
+    <div class="overview-basics">
+      <div class="row">
+        <div class="col span-6">
+          <LabelValue :name="t('harvester.virtualMachine.detail.details.name')" :value="value.nameDisplay">
+            <template #value>
+              <div class="smart-row">
+                <div class="console">
+                  {{ value.nameDisplay }}
+                </div>
+              </div>
+            </template>
+          </LabelValue>
+        </div>
+        <div class="col span-6">
+          <LabelValue :name="t('harvester.fields.image')" :value="imageName" />
+        </div>
+      </div>
+
+      <div class="row">
+        <div class="col span-6">
+          <LabelValue :name="t('harvester.virtualMachine.detail.details.hostname')" :value="hostname">
+            <template #value>
+              <div>
+                {{ hostname }}
+              </div>
+            </template>
+          </LabelValue>
+        </div>
+
+        <div class="col span-6">
+          <LabelValue :name="t('harvester.virtualMachine.detail.details.node')" :value="node">
+            <template #value>
+              <div>
+                {{ node }}
+              </div>
+            </template>
+          </LabelValue>
+        </div>
+      </div>
+
+      <div class="row">
+        <div class="col span-6">
+          <LabelValue :name="t('harvester.virtualMachine.detail.details.ipAddress')">
+            <template #value>
+              <HarvesterIpAddress v-model="value.id" :row="value" />
+            </template>
+          </LabelValue>
+        </div>
+
+        <div class="col span-6">
+          <LabelValue :name="t('harvester.virtualMachine.detail.details.created')" :value="creationTimestamp" />
+        </div>
+      </div>
+
+      <hr class="section-divider" />
+
+      <h2>{{ t('harvester.virtualMachine.detail.tabs.configurations') }}</h2>
+
+      <div class="row">
+        <div class="col span-6">
+          <InputOrDisplay :name="t('harvester.virtualMachine.detail.details.bootOrder')" :value="disks" :mode="mode">
+            <template #value>
+              <ul>
+                <li v-for="(disk) in disks" :key="disk.bootOrder">
+                  {{ disk.bootOrder }}. {{ disk.name }} ({{ getDeviceType(disk) }})
+                </li>
+              </ul>
+            </template>
+          </InputOrDisplay>
+        </div>
+        <div class="col span-6">
+          <InputOrDisplay :name="t('harvester.virtualMachine.detail.details.CDROMs')" :value="cdroms" :mode="mode">
+            <template #value>
+              <div>
+                <ul v-if="cdroms.length > 0">
+                  <li v-for="(rom) in cdroms" :key="rom.name">
+                    {{ rom.name }}
+                  </li>
+                </ul>
+                <span v-else>
+                  {{ t("harvester.virtualMachine.detail.notAvailable") }}
+                </span>
+              </div>
+            </template>
+          </InputOrDisplay>
+        </div>
+      </div>
+      <div class="row">
+        <div class="col span-6">
+          <LabelValue :name="t('harvester.virtualMachine.detail.details.operatingSystem')" :value="operatingSystem" />
+        </div>
+        <LabelValue :name="t('harvester.virtualMachine.detail.details.flavor')" :value="flavor" />
+      </div>
+      <div class="row">
+        <div class="col span-6">
+          <LabelValue :name="t('harvester.virtualMachine.detail.details.kernelRelease')" :value="kernelRelease" />
+        </div>
+
+        <div class="col span-6">
+          <LabelValue :name="t('harvester.virtualMachine.input.MachineType')" :value="machineType" />
+        </div>
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       </div>
     </div>
   </div>
@@ -244,9 +354,14 @@ export default {
 
 <style lang="scss" scoped>
   .consoleBut {
+<<<<<<< HEAD
     position: relative;
     top: -20px;
     left: 38px;
+=======
+    display: flex;
+    justify-content: flex-end;
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   }
 
   .overview-basics {
@@ -267,6 +382,10 @@ export default {
 
       .console {
         display: flex;
+<<<<<<< HEAD
+=======
+        overflow: hidden;
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       }
     }
 
diff --git a/pkg/harvester/detail/kubevirt.io.virtualmachine/index.vue b/pkg/harvester/detail/kubevirt.io.virtualmachine/index.vue
index e3032ffacd6..0a2e100d25b 100644
--- a/pkg/harvester/detail/kubevirt.io.virtualmachine/index.vue
+++ b/pkg/harvester/detail/kubevirt.io.virtualmachine/index.vue
@@ -2,6 +2,10 @@
 import { mapGetters } from 'vuex';
 import Tabbed from '@shell/components/Tabbed';
 import Tab from '@shell/components/Tabbed/Tab';
+<<<<<<< HEAD
+=======
+import LabelValue from '@shell/components/LabelValue';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 import { EVENT, SERVICE, POD } from '@shell/config/types';
 import { HCI } from '../../types';
 import CreateEditView from '@shell/mixins/create-edit-view';
@@ -9,7 +13,10 @@ import VM_MIXIN from '../../mixins/harvester-vm';
 import DashboardMetrics from '@shell/components/DashboardMetrics';
 import { allHash, setPromiseResult } from '@shell/utils/promise';
 import { allDashboardsExist } from '@shell/utils/grafana';
+<<<<<<< HEAD
 
+=======
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 import CloudConfig from '../../edit/kubevirt.io.virtualmachine/VirtualMachineCloudConfig';
 import Volume from '../../edit/kubevirt.io.virtualmachine/VirtualMachineVolume';
 import Network from '../../edit/kubevirt.io.virtualmachine/VirtualMachineNetwork';
@@ -22,6 +29,10 @@ import OverviewBasics from './VirtualMachineTabs/VirtualMachineBasics';
 import OverviewKeypairs from './VirtualMachineTabs/VirtualMachineKeypairs';
 import KeyValue from '@shell/components/form/KeyValue';
 import Labels from '@shell/components/form/Labels';
+<<<<<<< HEAD
+=======
+import { formatSi } from '@shell/utils/units';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 const VM_METRICS_DETAIL_URL = '/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy/d/harvester-vm-detail-1/vm-info-detail?orgId=1';
 
@@ -33,6 +44,10 @@ export default {
     Tabbed,
     Events,
     OverviewBasics,
+<<<<<<< HEAD
+=======
+    LabelValue,
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     Volume,
     Network,
     OverviewKeypairs,
@@ -57,15 +72,27 @@ export default {
 
   data() {
     return {
+<<<<<<< HEAD
       switchToCloud: false,
       VM_METRICS_DETAIL_URL,
       showVmMetrics: false,
+=======
+      hasResourceQuotaSchema: false,
+      switchToCloud:          false,
+      VM_METRICS_DETAIL_URL,
+      showVmMetrics:          false,
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     };
   },
 
   async created() {
     const inStore = this.$store.getters['currentProduct'].inStore;
 
+<<<<<<< HEAD
+=======
+    this.hasResourceQuotaSchema = !!this.$store.getters[`${ inStore }/schemaFor`](HCI.RESOURCE_QUOTA);
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     const hash = {
       pods:     this.$store.dispatch(`${ inStore }/findAll`, { type: POD }),
       services: this.$store.dispatch(`${ inStore }/findAll`, { type: SERVICE }),
@@ -75,6 +102,13 @@ export default {
       restore:  this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.RESTORE }),
     };
 
+<<<<<<< HEAD
+=======
+    if (this.hasResourceQuotaSchema) {
+      hash.resourceQuotas = this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.RESOURCE_QUOTA });
+    }
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     await allHash(hash);
 
     setPromiseResult(
@@ -88,6 +122,25 @@ export default {
   computed: {
     ...mapGetters(['currentCluster']),
 
+<<<<<<< HEAD
+=======
+    totalSnapshotSize() {
+      if (this.value.snapshotSizeQuota === undefined || this.value.snapshotSizeQuota === null) {
+        return ' - ';
+      }
+
+      if (this.value.snapshotSizeQuota === 0) {
+        return '0';
+      }
+
+      return formatSi(this.value.snapshotSizeQuota, {
+        increment: 1024,
+        addSuffix: true,
+        suffix:    'i',
+      });
+    },
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     vmi() {
       const inStore = this.$store.getters['currentProduct'].inStore;
 
@@ -175,10 +228,24 @@ export default {
         <Network v-model="networkRows" mode="view" />
       </Tab>
 
+<<<<<<< HEAD
       <Tab name="keypairs" :label="t('harvester.virtualMachine.detail.tabs.keypairs')" class="bordered-table" :weight="3">
         <OverviewKeypairs v-model="value" />
       </Tab>
 
+=======
+      <Tab name="keypairs" :label="t('harvester.virtualMachine.detail.tabs.keypairs')" class="bordered-table" :weight="4">
+        <OverviewKeypairs v-model="value" />
+      </Tab>
+
+      <Tab v-if="hasResourceQuotaSchema" name="quotas" :label="t('harvester.tab.quotas')" :weight="3">
+        <LabelValue
+          :name="t('harvester.snapshot.totalSnapshotSize')"
+          :value="totalSnapshotSize"
+        />
+      </Tab>
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       <Tab
         v-if="showVmMetrics"
         name="vm-metrics"
diff --git a/pkg/harvester/detail/network.harvesterhci.io.vlanconfig.vue b/pkg/harvester/detail/network.harvesterhci.io.vlanconfig.vue
index d6ddfa554fb..f0f1b905d07 100644
--- a/pkg/harvester/detail/network.harvesterhci.io.vlanconfig.vue
+++ b/pkg/harvester/detail/network.harvesterhci.io.vlanconfig.vue
@@ -46,6 +46,10 @@ export default {
           labelKey: 'tableHeaders.hostIp',
           search:   ['internalIp'],
           value:    'internalIp',
+<<<<<<< HEAD
+=======
+          sort:     ['internalIp'],
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         },
         AGE,
       ];
diff --git a/pkg/harvester/dialog/CloneVmDialog.vue b/pkg/harvester/dialog/CloneVmDialog.vue
index a93de39dc20..ce476ee0189 100644
--- a/pkg/harvester/dialog/CloneVmDialog.vue
+++ b/pkg/harvester/dialog/CloneVmDialog.vue
@@ -91,6 +91,7 @@ export default {
     </template>
 
     <template #body>
+<<<<<<< HEAD
       <Checkbox v-model="cloneData" class="mb-10" label-key="harvester.modal.cloneVM.type" />
 
       <LabeledInput
@@ -100,6 +101,24 @@ export default {
         :label="t('harvester.modal.cloneVM.name')"
         required
       />
+=======
+      <template v-if="!actionResource?.longhornV2Volumes.length">
+        <Checkbox v-model="cloneData" class="mb-10" label-key="harvester.modal.cloneVM.type" />
+
+        <LabeledInput
+          v-show="cloneData"
+          v-model="name"
+          class="mb-20"
+          :label="t('harvester.modal.cloneVM.name')"
+          required
+        />
+      </template>
+      <template v-else>
+        <Banner color="warning">
+          <t k="harvester.modal.cloneVM.message.support.longhorn" :raw="true" />
+        </Banner>
+      </template>
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     </template>
 
     <div slot="actions" class="actions">
@@ -109,6 +128,10 @@ export default {
         </button>
 
         <AsyncButton
+<<<<<<< HEAD
+=======
+          v-if="!actionResource?.longhornV2Volumes.length"
+>>>>>>> b5455bcb (fix: separate used/allocated units)
           mode="create"
           :action-label="cloneData ? t('harvester.modal.cloneVM.action.create') : t('harvester.modal.cloneVM.action.clone')"
           :disabled="cloneData && !name"
diff --git a/pkg/harvester/dialog/EnablePciPassthrough.vue b/pkg/harvester/dialog/EnablePciPassthrough.vue
new file mode 100644
index 00000000000..ffebe626ebc
--- /dev/null
+++ b/pkg/harvester/dialog/EnablePciPassthrough.vue
@@ -0,0 +1,118 @@
+<script>
+import { HCI } from '../types';
+import { mapGetters } from 'vuex';
+import { Card } from '@components/Card';
+import AsyncButton from '@shell/components/AsyncButton';
+import { escapeHtml } from '@shell/utils/string';
+
+export default {
+  name: 'HarvesterEnablePciPassthrough',
+
+  components: {
+    AsyncButton,
+    Card,
+  },
+
+  props: {
+    resources: {
+      type:     Array,
+      required: true
+    }
+  },
+
+  data() {
+    return {};
+  },
+
+  computed: { ...mapGetters({ t: 'i18n/t' }) },
+
+  methods: {
+    close() {
+      this.$emit('close');
+    },
+
+    async save(buttonCb) {
+      // isSingleProduct == this is a standalone Harvester cluster
+      const isSingleProduct = this.$store.getters['isSingleProduct'];
+      let userName = 'admin';
+
+      // if this is imported Harvester, there may be users other than 'admin
+      if (!isSingleProduct) {
+        const user = this.$store.getters['auth/v3User'];
+
+        userName = user?.username || user?.id;
+      }
+
+      for (let i = 0; i < this.resources.length; i++) {
+        const actionResource = this.resources[i];
+        const inStore = this.$store.getters['currentProduct'].inStore;
+        const pt = await this.$store.dispatch(`${ inStore }/create`, {
+          type:     HCI.PCI_CLAIM,
+          metadata: {
+            name:            actionResource.metadata.name,
+            ownerReferences: [{
+              apiVersion: 'devices.harvesterhci.io/v1beta1',
+              kind:       'PCIDevice',
+              name:       actionResource.metadata.name,
+              uid:        actionResource.metadata.uid,
+            }]
+          },
+          spec: {
+            address:  actionResource.status.address,
+            nodeName: actionResource.status.nodeName,
+            userName
+          }
+        } );
+
+        try {
+          await pt.save();
+          buttonCb(true);
+          this.close();
+        } catch (err) {
+          this.$store.dispatch('growl/fromError', {
+            title: this.t('harvester.pci.claimError', { name: escapeHtml(actionResource.metadata.name) }),
+            err,
+          }, { root: true });
+          buttonCb(false);
+        }
+      }
+    }
+  }
+};
+</script>
+
+<template>
+  <Card :show-highlight-border="false">
+    <h4
+      slot="title"
+      v-clean-html="t('promptRemove.title')"
+      class="text-default-text"
+    />
+
+    <template #body>
+      {{ t('harvester.pci.enablePassthroughWarning') }}
+    </template>
+
+    <div slot="actions" class="actions">
+      <div class="buttons">
+        <button class="btn role-secondary mr-10" @click="close">
+          {{ t('generic.cancel') }}
+        </button>
+
+        <AsyncButton mode="enable" @click="save" />
+      </div>
+    </div>
+  </Card>
+</template>
+
+<style lang="scss" scoped>
+.actions {
+  width: 100%;
+}
+
+.buttons {
+  display: flex;
+  justify-content: flex-end;
+  width: 100%;
+}
+</style>
diff --git a/pkg/harvester/dialog/EnableUSBPassthrough.vue b/pkg/harvester/dialog/EnableUSBPassthrough.vue
new file mode 100644
index 00000000000..a751b955163
--- /dev/null
+++ b/pkg/harvester/dialog/EnableUSBPassthrough.vue
@@ -0,0 +1,118 @@
+<script>
+import { HCI } from '../types';
+import { mapGetters } from 'vuex';
+import { Card } from '@components/Card';
+import AsyncButton from '@shell/components/AsyncButton';
+import { escapeHtml } from '@shell/utils/string';
+
+export default {
+  name: 'HarvesterEnableUSBPassthrough',
+
+  components: {
+    AsyncButton,
+    Card,
+  },
+
+  props: {
+    resources: {
+      type:     Array,
+      required: true
+    }
+  },
+
+  data() {
+    return {};
+  },
+
+  computed: { ...mapGetters({ t: 'i18n/t' }) },
+
+  methods: {
+    close() {
+      this.$emit('close');
+    },
+
+    async save(buttonCb) {
+      // isSingleProduct == this is a standalone Harvester cluster
+      const isSingleProduct = this.$store.getters['isSingleProduct'];
+      let userName = 'admin';
+
+      // if this is imported Harvester, there may be users other than 'admin
+      if (!isSingleProduct) {
+        const user = this.$store.getters['auth/v3User'];
+
+        userName = user?.username || user?.id;
+      }
+
+      for (let i = 0; i < this.resources.length; i++) {
+        const actionResource = this.resources[i];
+        const inStore = this.$store.getters['currentProduct'].inStore;
+        const pt = await this.$store.dispatch(`${ inStore }/create`, {
+          type:     HCI.USB_CLAIM,
+          metadata: {
+            name:            actionResource.metadata.name,
+            ownerReferences: [{
+              apiVersion: 'devices.harvesterhci.io/v1beta1',
+              kind:       'USBDevice',
+              name:       actionResource.metadata.name,
+              uid:        actionResource.metadata.uid,
+            }]
+          },
+          spec: {
+            pciAddress: actionResource.status.pciAddress,
+            nodeName:   actionResource.status.nodeName,
+            userName
+          }
+        } );
+
+        try {
+          await pt.save();
+          buttonCb(true);
+          this.close();
+        } catch (err) {
+          this.$store.dispatch('growl/fromError', {
+            title: this.t('harvester.usb.claimError', { name: escapeHtml(actionResource.metadata.name) }),
+            err,
+          }, { root: true });
+          buttonCb(false);
+        }
+      }
+    }
+  }
+};
+</script>
+
+<template>
+  <Card :show-highlight-border="false">
+    <h4
+      slot="title"
+      v-clean-html="t('promptRemove.title')"
+      class="text-default-text"
+    />
+
+    <template #body>
+      <t k="harvester.usb.enablePassthroughWarning" :raw="true" />
+    </template>
+
+    <div slot="actions" class="actions">
+      <div class="buttons">
+        <button class="btn role-secondary mr-10" @click="close">
+          {{ t('generic.cancel') }}
+        </button>
+
+        <AsyncButton mode="enable" @click="save" />
+      </div>
+    </div>
+  </Card>
+</template>
+
+<style lang="scss" scoped>
+.actions {
+  width: 100%;
+}
+
+.buttons {
+  display: flex;
+  justify-content: flex-end;
+  width: 100%;
+}
+</style>
diff --git a/pkg/harvester/dialog/HarvesterExportImageDialog.vue b/pkg/harvester/dialog/HarvesterExportImageDialog.vue
index 1e4a3797fcc..f560878127a 100644
--- a/pkg/harvester/dialog/HarvesterExportImageDialog.vue
+++ b/pkg/harvester/dialog/HarvesterExportImageDialog.vue
@@ -141,6 +141,7 @@ export default {
     </template>
 
     <template #body>
+<<<<<<< HEAD
       <LabeledSelect
         v-model="namespace"
         :label="t('harvester.modal.exportImage.namespace')"
@@ -162,6 +163,36 @@ export default {
         class="mt-20"
         required
       />
+=======
+      <template v-if="actionResource?.isLonghornV2">
+        <Banner color="warning">
+          <t k="harvester.modal.exportImage.message.support.longhorn" :raw="true" />
+        </Banner>
+      </template>
+      <template v-else>
+        <LabeledSelect
+          v-model="namespace"
+          :label="t('harvester.modal.exportImage.namespace')"
+          :options="namespaces"
+          class="mb-20"
+          required
+        />
+
+        <LabeledInput
+          v-model="name"
+          :label="t('harvester.modal.exportImage.name')"
+          required
+        />
+
+        <LabeledSelect
+          v-model="storageClassName"
+          :options="storageClassOptions"
+          :label="t('harvester.storage.storageClass.label')"
+          class="mt-20"
+          required
+        />
+      </template>
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     </template>
 
     <div slot="actions" class="actions">
@@ -171,6 +202,10 @@ export default {
         </button>
 
         <AsyncButton
+<<<<<<< HEAD
+=======
+          v-if="!actionResource?.isLonghornV2"
+>>>>>>> b5455bcb (fix: separate used/allocated units)
           mode="create"
           :disabled="disableSave"
           @click="save"
diff --git a/pkg/harvester/dialog/HarvesterMigrationDialog.vue b/pkg/harvester/dialog/HarvesterMigrationDialog.vue
index 1f495eee467..d5b1d16f0f3 100644
--- a/pkg/harvester/dialog/HarvesterMigrationDialog.vue
+++ b/pkg/harvester/dialog/HarvesterMigrationDialog.vue
@@ -68,12 +68,28 @@ export default {
       return resource;
     },
 
+<<<<<<< HEAD
+=======
+    cpuPinningAlertMessage() {
+      return this.t('harvester.virtualMachine.cpuPinning.migrationMessage');
+    },
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     nodeNameList() {
       const nodes = this.$store.getters['harvester/all'](NODE);
 
       return nodes.filter((n) => {
+<<<<<<< HEAD
         // do not allow to migrate to self node and witness node
         return n.isEtcd !== 'true' && !!this.availableNodes.includes(n.id);
+=======
+        const isNotSelfNode = !!this.availableNodes.includes(n.id);
+        const isNotWitnessNode = n.isEtcd !== 'true'; // do not allow to migrate to self node and witness node
+        const isCpuPinning = this.actionResource?.isCpuPinning;
+        const matchingCpuManagerConfig = !isCpuPinning || n.isCPUManagerEnabled; // If cpu-pinning is enabled, filter-out non-enabled CPU manager nodes.
+
+        return isNotSelfNode && isNotWitnessNode && matchingCpuManagerConfig;
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       }).map((n) => {
         let label = n?.metadata?.name;
         const value = n?.metadata?.name;
@@ -140,6 +156,10 @@ export default {
     </template>
 
     <template #body>
+<<<<<<< HEAD
+=======
+      <Banner v-if="actionResource?.isCpuPinning" color="warning" :label="cpuPinningAlertMessage" />
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       <LabeledSelect
         v-model="nodeName"
         :label="t('harvester.modal.migration.fields.nodeName.label')"
@@ -160,7 +180,10 @@ export default {
           @click="apply"
         />
       </div>
+<<<<<<< HEAD
 
+=======
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       <Banner v-for="(err, i) in errors" :key="i" color="error" :label="err" />
     </div>
   </Card>
diff --git a/pkg/harvester/dialog/HarvesterQuotaDialog.vue b/pkg/harvester/dialog/HarvesterQuotaDialog.vue
new file mode 100644
index 00000000000..afcd15593f8
--- /dev/null
+++ b/pkg/harvester/dialog/HarvesterQuotaDialog.vue
@@ -0,0 +1,120 @@
+<script>
+import { mapGetters, mapState } from 'vuex';
+import { Card } from '@components/Card';
+import { Banner } from '@components/Banner';
+import AsyncButton from '@shell/components/AsyncButton';
+import UnitInput from '@shell/components/form/UnitInput';
+import { exceptionToErrorsArray } from '@shell/utils/error';
+
+export default {
+  name: 'HarvesterVMQuotaDialog',
+
+  components: {
+    AsyncButton,
+    Card,
+    UnitInput,
+    Banner
+  },
+
+  props: {
+    resources: {
+      type:     Array,
+      required: true
+    }
+  },
+
+  created() {
+    this.totalSnapshotSize = this.modalData.snapshotSizeQuota;
+  },
+
+  data() {
+    return {
+      totalSnapshotSize: '',
+      errors:            []
+    };
+  },
+
+  computed: {
+    ...mapState('action-menu', ['modalData']),
+    ...mapGetters({ t: 'i18n/t' }),
+
+    actionResource() {
+      return this.resources[0];
+    },
+  },
+
+  methods: {
+
+    close() {
+      this.totalSnapshotSize = '';
+      this.$emit('close');
+    },
+
+    async save(buttonDone) {
+      try {
+        // call delete action if user input 0Gi or empty string
+        if (this.totalSnapshotSize === null || this.totalSnapshotSize === '0Gi' ) {
+          await this.actionResource.doAction('deleteResourceQuota');
+        } else {
+          await this.actionResource.doAction('updateResourceQuota', { totalSnapshotSizeQuota: this.totalSnapshotSize });
+        }
+        this.close();
+        buttonDone(true);
+      } catch (err) {
+        const error = err?.data || err;
+        const message = exceptionToErrorsArray(error);
+
+        this.$set(this, 'errors', message);
+        buttonDone(false);
+      }
+    },
+  }
+};
+</script>
+
+<template>
+  <Card :show-highlight-border="false">
+    <h4
+      slot="title"
+      v-clean-html="t('harvester.modal.quota.editQuota')"
+      class="text-default-text"
+    />
+    <template #body>
+      <Banner color="info">
+        {{ t('harvester.modal.quota.bannerMessage') }}
+      </Banner>
+      <UnitInput
+        v-model="totalSnapshotSize"
+        v-int-number
+        :label="t('harvester.snapshot.totalSnapshotSize')"
+        :disabled="false"
+        :input-exponent="3"
+        :increment="1024"
+        :output-modifier="true"
+        suffix="GiB"
+        class="mb-20"
+      />
+    </template>
+    <div slot="actions" class="actions">
+      <div class="buttons">
+        <button class="btn role-secondary mr-10" @click="close">
+          {{ t('generic.cancel') }}
+        </button>
+        <AsyncButton @click="save" />
+      </div>
+      <Banner v-for="(err, i) in errors" :key="i" color="error" :label="err" />
+    </div>
+  </Card>
+</template>
+
+<style lang="scss" scoped>
+.actions {
+  width: 100%;
+}
+
+.buttons {
+  display: flex;
+  justify-content: flex-end;
+  width: 100%;
+}
+</style>
diff --git a/pkg/harvester/dialog/HarvesterSupportBundle.vue b/pkg/harvester/dialog/HarvesterSupportBundle.vue
index af905c80e54..8da3f98f32a 100644
--- a/pkg/harvester/dialog/HarvesterSupportBundle.vue
+++ b/pkg/harvester/dialog/HarvesterSupportBundle.vue
@@ -109,7 +109,11 @@ export default {
   <app-modal
     v-if="showModal"
     custom-class="bundleModal"
+<<<<<<< HEAD
     name="bundle-modal andy"
+=======
+    name="bundle-modal"
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     :click-to-close="false"
     :width="550"
     :height="390"
diff --git a/pkg/harvester/dialog/HarvesterVMSnapshotDialog.vue b/pkg/harvester/dialog/HarvesterVMSnapshotDialog.vue
index f027c6c2294..d21db8e8dd2 100644
--- a/pkg/harvester/dialog/HarvesterVMSnapshotDialog.vue
+++ b/pkg/harvester/dialog/HarvesterVMSnapshotDialog.vue
@@ -74,7 +74,11 @@ export default {
             'growl/success',
             {
               title:   this.t('generic.notification.title.succeed'),
+<<<<<<< HEAD
               message: this.t('harvester.modal.vmSnapshot.success', { name: this.snapshotName })
+=======
+              message: this.t('harvester.modal.vmSnapshot.message.success', { name: this.snapshotName })
+>>>>>>> b5455bcb (fix: separate used/allocated units)
             },
             { root: true }
           );
@@ -118,8 +122,29 @@ export default {
     />
 
     <template #body>
+<<<<<<< HEAD
       <LabeledInput v-model="actionResource.metadata.namespace" :disabled="true" :label="t('generic.namespace')" />
       <LabeledInput v-model="snapshotName" class="mt-20" :label="t('generic.name')" required />
+=======
+      <template v-if="actionResource?.longhornV2Volumes.length > 0">
+        <Banner color="warning">
+          <t k="harvester.modal.vmSnapshot.message.support.longhorn" :raw="true" />
+        </Banner>
+      </template>
+      <template v-else>
+        <LabeledInput
+          v-model="actionResource.metadata.namespace"
+          :disabled="true"
+          :label="t('generic.namespace')"
+        />
+        <LabeledInput
+          v-model="snapshotName"
+          class="mt-20"
+          :label="t('generic.name')"
+          required
+        />
+      </template>
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     </template>
 
     <div slot="actions" class="actions">
@@ -128,7 +153,16 @@ export default {
           {{ t('generic.cancel') }}
         </button>
 
+<<<<<<< HEAD
         <AsyncButton mode="create" :disabled="!snapshotName" @click="save" />
+=======
+        <AsyncButton
+          v-if="!actionResource?.longhornV2Volumes.length"
+          mode="create"
+          :disabled="!snapshotName"
+          @click="save"
+        />
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       </div>
 
       <Banner v-for="(err, i) in errors" :key="i" color="error" :label="err" />
diff --git a/pkg/harvester/dialog/SnapshotDialog.vue b/pkg/harvester/dialog/SnapshotDialog.vue
index 1a6a423c24f..32ff55ac741 100644
--- a/pkg/harvester/dialog/SnapshotDialog.vue
+++ b/pkg/harvester/dialog/SnapshotDialog.vue
@@ -70,7 +70,15 @@ export default {
       {{ t('harvester.modal.snapshot.title') }}
     </template>
     <template #body>
+<<<<<<< HEAD
       <LabeledInput
+=======
+      <Banner v-if="actionResource?.isLonghornV2" color="warning">
+        <t k="harvester.modal.snapshot.message.support.longhorn" :raw="true" />
+      </Banner>
+      <LabeledInput
+        v-else
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         v-model="name"
         :label="t('harvester.modal.snapshot.name')"
         required
@@ -82,6 +90,10 @@ export default {
           {{ t('generic.cancel') }}
         </button>
         <AsyncButton
+<<<<<<< HEAD
+=======
+          v-if="!actionResource?.isLonghornV2"
+>>>>>>> b5455bcb (fix: separate used/allocated units)
           mode="create"
           :disabled="disableSave"
           @click="save"
diff --git a/pkg/harvester/dialog/VolumeCloneDialog.vue b/pkg/harvester/dialog/VolumeCloneDialog.vue
index 83234c79e4c..78eeabfb4d7 100644
--- a/pkg/harvester/dialog/VolumeCloneDialog.vue
+++ b/pkg/harvester/dialog/VolumeCloneDialog.vue
@@ -81,6 +81,7 @@ export default {
       {{ t('harvester.modal.volumeClone.title') }}
     </template>
     <template #body>
+<<<<<<< HEAD
       <Checkbox v-model="cloneData" class="mb-10" label-key="harvester.modal.cloneVM.type" />
 
       <LabeledInput
@@ -90,6 +91,24 @@ export default {
         :label="t('harvester.modal.volumeClone.name')"
         required
       />
+=======
+      <template v-if="!actionResource?.isLonghornV2">
+        <Checkbox v-model="cloneData" class="mb-10" label-key="harvester.modal.cloneVM.type" />
+
+        <LabeledInput
+          v-show="cloneData"
+          v-model="name"
+          class="mb-20"
+          :label="t('harvester.modal.volumeClone.name')"
+          required
+        />
+      </template>
+      <template v-else>
+        <Banner color="warning">
+          <t k="harvester.modal.volumeClone.message.support.longhorn" :raw="true" />
+        </Banner>
+      </template>
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     </template>
     <div slot="actions" class="actions">
       <div class="buttons">
@@ -97,6 +116,10 @@ export default {
           {{ t('generic.cancel') }}
         </button>
         <AsyncButton
+<<<<<<< HEAD
+=======
+          v-if="!actionResource?.isLonghornV2"
+>>>>>>> b5455bcb (fix: separate used/allocated units)
           mode="create"
           :disabled="disableSave"
           @click="save"
diff --git a/pkg/harvester/edit/harvesterhci.io.host/HarvesterDisk.vue b/pkg/harvester/edit/harvesterhci.io.host/HarvesterDisk.vue
index 3391ff17c54..c852cc37d3e 100644
--- a/pkg/harvester/edit/harvesterhci.io.host/HarvesterDisk.vue
+++ b/pkg/harvester/edit/harvesterhci.io.host/HarvesterDisk.vue
@@ -1,22 +1,52 @@
 <script>
+<<<<<<< HEAD
+=======
+import { allHash } from '@shell/utils/promise';
+import { CSI_DRIVER, LONGHORN } from '@shell/config/types';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 import { LabeledInput } from '@components/Form/LabeledInput';
 import LabelValue from '@shell/components/LabelValue';
 import { BadgeState } from '@components/BadgeState';
 import { Banner } from '@components/Banner';
+<<<<<<< HEAD
+=======
+import LabeledSelect from '@shell/components/form/LabeledSelect';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 import { RadioGroup, RadioButton } from '@components/Form/Radio';
 import HarvesterDisk from '../../mixins/harvester-disk';
 import Tags from '../../components/DiskTags';
 import { HCI } from '../../types';
+<<<<<<< HEAD
 import { LONGHORN_SYSTEM } from './index';
+=======
+import { HCI as HCI_LABELS_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
+import { LONGHORN_SYSTEM } from './index';
+import { LONGHORN_DRIVER, LONGHORN_VERSION_V1, LONGHORN_VERSION_V2 } from '@shell/models/persistentvolume';
+import { LVM_DRIVER } from '../../models/harvester/storage.k8s.io.storageclass';
+import ModalWithCard from '@shell/components/ModalWithCard';
+import { randomStr } from '@shell/utils/string';
+import { LONGHORN_V2_DATA_ENGINE } from './index.vue';
+import { _EDIT } from '@shell/config/query-params';
+
+const _NEW = '_NEW';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 export default {
   components: {
     LabeledInput,
+<<<<<<< HEAD
+=======
+    LabeledSelect,
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     LabelValue,
     BadgeState,
     Banner,
     RadioGroup,
     RadioButton,
+<<<<<<< HEAD
+=======
+    ModalWithCard,
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     Tags,
   },
 
@@ -35,11 +65,21 @@ export default {
       type:    Array,
       default: () => [],
     },
+<<<<<<< HEAD
+=======
+    node: {
+      type:    Object,
+      default: () => {
+        return {};
+      },
+    },
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     mode: {
       type:    String,
       default: 'edit',
     },
   },
+<<<<<<< HEAD
   data() {
     return {};
   },
@@ -47,6 +87,86 @@ export default {
     targetDisk() {
       return this.disks.find(disk => disk.name === this.value.name);
     },
+=======
+
+  async fetch() {
+    const inStore = this.$store.getters['currentProduct'].inStore;
+
+    await allHash({
+      csiDrivers:      this.$store.dispatch(`${ inStore }/findAll`, { type: CSI_DRIVER }),
+      lvmVolumeGroups: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.LVM_VOLUME_GROUP }),
+    });
+  },
+
+  data() {
+    let provisioner = `${ this.value.provisioner || LONGHORN_DRIVER }`;
+
+    if (provisioner === LONGHORN_DRIVER) {
+      provisioner = `${ provisioner }_${ this.value.provisionerVersion || LONGHORN_VERSION_V1 }`;
+    }
+
+    return {
+      provisioner,
+      volumeGroupDialog: null,
+      randomStr:         randomStr(10).toLowerCase(),
+      isOpen:            false
+    };
+  },
+
+  computed: {
+    provisioners() {
+      const out = [];
+
+      const inStore = this.$store.getters['currentProduct'].inStore;
+      const csiDrivers = this.$store.getters[`${ inStore }/all`](CSI_DRIVER) || [];
+
+      csiDrivers.forEach(({ name }) => {
+        switch (name) {
+        case LONGHORN_DRIVER:
+          out.push({
+            label: `harvester.host.disk.storage.longhorn.${ LONGHORN_VERSION_V1 }.label`,
+            value: `${ name }_${ LONGHORN_VERSION_V1 }`,
+          });
+
+          if (this.longhornSystemVersion === LONGHORN_VERSION_V2 || this.value.provisionerVersion === LONGHORN_VERSION_V2) {
+            out.push({
+              label:    `harvester.host.disk.storage.longhorn.${ LONGHORN_VERSION_V2 }.label`,
+              value:    `${ name }_${ LONGHORN_VERSION_V2 }`,
+              disabled: this.forceLonghornV1
+            });
+          }
+          break;
+        case LVM_DRIVER:
+          out.push({
+            label: 'harvester.host.disk.storage.lvm.label',
+            value: name,
+          });
+          break;
+        }
+      });
+
+      return out;
+    },
+
+    lvmVolumeGroups() {
+      const inStore = this.$store.getters['currentProduct'].inStore;
+      const lvmVolumeGroups = this.$store.getters[`${ inStore }/all`](HCI.LVM_VOLUME_GROUP) || [];
+
+      const out = lvmVolumeGroups.filter(group => group.spec.nodeName === this.node.name).map(g => g.spec.vgName);
+
+      out.unshift({
+        label: this.t('harvester.host.disk.lvmVolumeGroup.create'),
+        value: _NEW,
+      });
+
+      return out;
+    },
+
+    targetDisk() {
+      return this.disks.find(disk => disk.name === this.value.name);
+    },
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     schedulableTooltipMessage() {
       const { name, path } = this.value;
 
@@ -56,6 +176,10 @@ export default {
         return this.schedulableCondition.message;
       }
     },
+<<<<<<< HEAD
+=======
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     allowSchedulingOptions() {
       return [{
         label: this.t('generic.enabled'),
@@ -87,7 +211,11 @@ export default {
     },
 
     isProvisioned() {
+<<<<<<< HEAD
       return this.blockDevice?.spec.fileSystem.provisioned;
+=======
+      return this.blockDevice?.isProvisioned;
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     },
 
     forceFormattedDisabled() {
@@ -153,8 +281,88 @@ export default {
     isFormatting() {
       return this.blockDevice.isFormatting;
     },
+<<<<<<< HEAD
+  },
+  methods: {
+=======
+
+    longhornSystemVersion() {
+      const inStore = this.$store.getters['currentProduct'].inStore;
+      const v2DataEngine = this.$store.getters[`${ inStore }/byId`](LONGHORN.SETTINGS, LONGHORN_V2_DATA_ENGINE) || {};
+
+      return v2DataEngine.value === 'true' ? LONGHORN_VERSION_V2 : LONGHORN_VERSION_V1;
+    },
+
+    forceLonghornV1() {
+      return this.node?.labels[HCI_LABELS_ANNOTATIONS.DISABLE_LONGHORN_V2_ENGINE] === 'true';
+    },
+
+    isLvm() {
+      return this.value.provisioner === LVM_DRIVER;
+    },
+
+    isLonghorn() {
+      return this.value.provisioner === LONGHORN_DRIVER;
+    },
+
+    isLonghornV1() {
+      return this.isLonghorn && this.value.provisionerVersion === LONGHORN_VERSION_V1;
+    },
+
+    provisionerTooltip() {
+      if (
+        this.mode === _EDIT &&
+        this.isLonghorn &&
+        this.longhornSystemVersion === LONGHORN_VERSION_V2 &&
+        this.forceLonghornV1
+      ) {
+        return this.t('harvester.storage.storageClass.longhorn.versionTooltip');
+      }
+
+      return null;
+    }
+  },
+
+  watch: {
+    provisioner(value) {
+      this.randomStr = randomStr(10).toLowerCase();
+
+      const [provisioner, provisionerVersion] = value?.split('_');
+
+      this.value.provisioner = provisioner;
+
+      if (provisioner === LONGHORN_DRIVER) {
+        this.value.provisionerVersion = provisionerVersion || LONGHORN_VERSION_V1;
+      } else {
+        this.value.provisionerVersion = undefined;
+      }
+    },
+
+    'value.lvmVolumeGroup'(neu) {
+      if (neu === _NEW) {
+        this.value.lvmVolumeGroup = null;
+        this.showCreateVolumeGroup();
+      }
+    }
   },
+
   methods: {
+    showCreateVolumeGroup() {
+      this.volumeGroupDialog = null;
+      this.isOpen = true;
+    },
+
+    hideCreateVolumeGroup() {
+      this.isOpen = false;
+    },
+
+    saveCreateVolumeGroup(buttonCb) {
+      buttonCb(true);
+      this.value.lvmVolumeGroup = this.volumeGroupDialog;
+      this.hideCreateVolumeGroup();
+    },
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     update() {
       this.$emit('input', this.value);
     },
@@ -176,7 +384,11 @@ export default {
       :label="t('harvester.host.disk.fileSystem.formatting')"
     />
     <Banner
+<<<<<<< HEAD
       v-else-if="isFormatted && !isCorrupted"
+=======
+      v-else-if="isFormatted && isLonghornV1 && !isCorrupted"
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       color="info"
       :label="formattedBannerLabel"
     />
@@ -256,8 +468,27 @@ export default {
         />
       </div>
     </div>
+<<<<<<< HEAD
     <div v-if="(value.isNew && !isFormatted) || isCorrupted" class="row mt-10">
       <div class="col span-6">
+=======
+
+    <div class="row mt-10">
+      <div :class="`col span-${ value.isNew ? '6': '12' }`">
+        <LabeledSelect
+          v-model="provisioner"
+          :mode="mode"
+          label-key="harvester.host.disk.provisioner"
+          :localized-label="true"
+          :searchable="true"
+          :options="provisioners"
+          :disabled="isProvisioned || !value.isNew"
+          :tooltip="provisionerTooltip"
+          @keydown.native.enter.prevent="()=>{}"
+        />
+      </div>
+      <div v-if="(value.isNew && isLonghornV1 && !isFormatted) || isCorrupted" class="col span-6">
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         <RadioGroup
           v-model="value.forceFormatted"
           :mode="mode"
@@ -279,7 +510,48 @@ export default {
           </template>
         </RadioGroup>
       </div>
+<<<<<<< HEAD
+    </div>
+=======
+      <div v-if="value.isNew && isLvm" class="col span-6">
+        <LabeledSelect
+          v-model="value.lvmVolumeGroup"
+          :mode="mode"
+          label-key="harvester.host.disk.lvmVolumeGroup.label"
+          :localized-label="true"
+          :searchable="false"
+          :taggable="true"
+          :multiple="false"
+          :required="true"
+          :disabled="isProvisioned"
+          :options="lvmVolumeGroups"
+          @keydown.native.enter.prevent="()=>{}"
+        />
+      </div>
     </div>
+    <ModalWithCard
+      v-if="isOpen"
+      :ref="randomStr"
+      :name="randomStr"
+      width="30%"
+      @finish="saveCreateVolumeGroup"
+      @close="hideCreateVolumeGroup"
+    >
+      <template #title>
+        {{ t('harvester.host.disk.lvmVolumeGroup.label') }}
+      </template>
+
+      <template #content>
+        <LabeledInput
+          v-model="volumeGroupDialog"
+          :label="t('generic.name')"
+          class="mb-20"
+          required
+          @keydown.native.enter.prevent="()=>{}"
+        />
+      </template>
+    </ModalWithCard>
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   </div>
 </template>
 
diff --git a/pkg/harvester/edit/harvesterhci.io.host/HarvesterKsmtuned.vue b/pkg/harvester/edit/harvesterhci.io.host/HarvesterKsmtuned.vue
index 541c9f10e55..6184cdcb4a8 100644
--- a/pkg/harvester/edit/harvesterhci.io.host/HarvesterKsmtuned.vue
+++ b/pkg/harvester/edit/harvesterhci.io.host/HarvesterKsmtuned.vue
@@ -5,6 +5,10 @@ import UnitInput from '@shell/components/form/UnitInput';
 import { RadioGroup } from '@components/Form/Radio';
 import { Checkbox } from '@components/Form/Checkbox';
 import { HCI } from '../../types';
+<<<<<<< HEAD
+=======
+import { DOC_LINKS } from '../../config/doc-links';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 export const ksmtunedMode = [{
   value: 'standard',
@@ -86,6 +90,13 @@ export default {
 
     showKsmt() {
       return this.spec.run === 'run';
+<<<<<<< HEAD
+=======
+    },
+
+    ksmtunedLink() {
+      return DOC_LINKS.KSMTUNED_MODE;
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     }
   },
 
@@ -135,7 +146,11 @@ export default {
       <Checkbox v-model="enableMergeAcrossNodes" :mode="mode" class="check mb-20" type="checkbox" :label="t('harvester.host.ksmtuned.enableMergeNodes')" />
 
       <h3>
+<<<<<<< HEAD
         <t k="harvester.host.ksmtuned.modeLink" :raw="true" />
+=======
+        <t k="harvester.host.ksmtuned.modeLink" :raw="true" :url="ksmtunedLink" />
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       </h3>
       <RadioGroup
         v-model="spec.mode"
diff --git a/pkg/harvester/edit/harvesterhci.io.host/index.vue b/pkg/harvester/edit/harvesterhci.io.host/index.vue
index 0c201077f50..750d92476d5 100644
--- a/pkg/harvester/edit/harvesterhci.io.host/index.vue
+++ b/pkg/harvester/edit/harvesterhci.io.host/index.vue
@@ -29,9 +29,20 @@ import HarvesterDisk from './HarvesterDisk';
 import HarvesterKsmtuned from './HarvesterKsmtuned';
 import HarvesterSeeder from './HarvesterSeeder';
 import Tags from '../../components/DiskTags';
+<<<<<<< HEAD
 
 export const LONGHORN_SYSTEM = 'longhorn-system';
 
+=======
+import { LONGHORN_DRIVER, LONGHORN_VERSION_V1, LONGHORN_VERSION_V2 } from '@shell/models/persistentvolume';
+import { LVM_DRIVER } from '../../models/harvester/storage.k8s.io.storageclass';
+import isEqual from 'lodash/isEqual';
+
+export const LONGHORN_SYSTEM = 'longhorn-system';
+
+export const LONGHORN_V2_DATA_ENGINE = 'longhorn-system/v2-data-engine';
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 export default {
   name:       'HarvesterEditNode',
   components: {
@@ -62,10 +73,18 @@ export default {
     const inStore = this.$store.getters['currentProduct'].inStore;
 
     const hash = {
+<<<<<<< HEAD
       longhornNodes: this.$store.dispatch(`${ inStore }/findAll`, { type: LONGHORN.NODES }),
       blockDevices:  this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.BLOCK_DEVICE }),
       addons:        this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.ADD_ONS }),
       secrets:       this.$store.dispatch(`${ inStore }/findAll`, { type: SECRET }),
+=======
+      longhornNodes:        this.$store.dispatch(`${ inStore }/findAll`, { type: LONGHORN.NODES }),
+      blockDevices:         this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.BLOCK_DEVICE }),
+      addons:               this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.ADD_ONS }),
+      secrets:              this.$store.dispatch(`${ inStore }/findAll`, { type: SECRET }),
+      longhornV2DataEngine: this.$store.dispatch(`${ inStore }/find`, { type: LONGHORN.SETTINGS, id: LONGHORN_V2_DATA_ENGINE }),
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     };
 
     if (this.$store.getters[`${ inStore }/schemaFor`](HCI.INVENTORY)) {
@@ -76,16 +95,24 @@ export default {
 
     const blockDevices = this.$store.getters[`${ inStore }/all`](HCI.BLOCK_DEVICE);
     const provisionedBlockDevices = blockDevices.filter((d) => {
+<<<<<<< HEAD
       const provisioned = d?.spec?.fileSystem?.provisioned;
       const isCurrentNode = d?.spec?.nodeName === this.value.id;
       const isLonghornMounted = findBy(this.longhornDisks, 'name', d.metadata.name);
 
       return provisioned && isCurrentNode && !isLonghornMounted;
+=======
+      const isCurrentNode = d?.spec?.nodeName === this.value.id;
+      const isLonghornMounted = findBy(this.longhornDisks, 'name', d.metadata.name);
+
+      return d?.isProvisioned && isCurrentNode && !isLonghornMounted;
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     })
       .map((d) => {
         const corrupted = d?.status?.deviceStatus?.fileSystem?.corrupted;
 
         return {
+<<<<<<< HEAD
           isNew:          true,
           name:           d?.metadata?.name,
           originPath:     d?.spec?.fileSystem?.mountPoint,
@@ -93,6 +120,18 @@ export default {
           blockDevice:    d,
           displayName:    d?.displayName,
           forceFormatted: corrupted ? true : d?.spec?.fileSystem?.forceFormatted || false,
+=======
+          isNew:              true,
+          name:               d?.metadata?.name,
+          originPath:         d?.spec?.fileSystem?.mountPoint,
+          path:               d?.spec?.fileSystem?.mountPoint,
+          blockDevice:        d,
+          displayName:        d?.displayName,
+          forceFormatted:     corrupted ? true : d?.spec?.fileSystem?.forceFormatted || false,
+          provisioner:        d?.spec?.provisioner?.lvm ? LVM_DRIVER : LONGHORN_DRIVER,
+          provisionerVersion: d?.spec?.provisioner?.longhorn?.engineVersion || LONGHORN_VERSION_V1,
+          lvmVolumeGroup:     d?.spec?.provisioner?.lvm?.vgName,
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         };
       });
 
@@ -156,6 +195,16 @@ export default {
       return out;
     },
 
+<<<<<<< HEAD
+=======
+    longhornSystemVersion() {
+      const inStore = this.$store.getters['currentProduct'].inStore;
+      const v2DataEngine = this.$store.getters[`${ inStore }/byId`](LONGHORN.SETTINGS, LONGHORN_V2_DATA_ENGINE) || {};
+
+      return v2DataEngine.value === 'true' ? LONGHORN_VERSION_V2 : LONGHORN_VERSION_V1;
+    },
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     longhornDisks() {
       const inStore = this.$store.getters['currentProduct'].inStore;
       const longhornNode = this.$store.getters[`${ inStore }/byId`](LONGHORN.NODES, `${ LONGHORN_SYSTEM }/${ this.value.id }`);
@@ -176,6 +225,7 @@ export default {
         return {
           ...diskStatus[key],
           ...diskSpec?.[key],
+<<<<<<< HEAD
           name:             key,
           isNew:            false,
           storageReserved:  formatSi(diskSpec[key]?.storageReserved, formatOptions),
@@ -186,6 +236,21 @@ export default {
           displayName:      blockDevice?.displayName || key,
           forceFormatted:   blockDevice?.spec?.fileSystem?.forceFormatted || false,
           tags:             diskSpec?.[key]?.tags || [],
+=======
+          name:               key,
+          isNew:              false,
+          storageReserved:    formatSi(diskSpec[key]?.storageReserved, formatOptions),
+          storageAvailable:   formatSi(diskStatus[key]?.storageAvailable, formatOptions),
+          storageMaximum:     formatSi(diskStatus[key]?.storageMaximum, formatOptions),
+          storageScheduled:   formatSi(diskStatus[key]?.storageScheduled, formatOptions),
+          blockDevice,
+          displayName:        blockDevice?.displayName || key,
+          forceFormatted:     blockDevice?.spec?.fileSystem?.forceFormatted || false,
+          tags:               diskSpec?.[key]?.tags || [],
+          provisioner:        blockDevice?.spec?.provisioner?.lvm ? LVM_DRIVER : LONGHORN_DRIVER,
+          provisionerVersion: blockDevice?.spec?.provisioner?.longhorn?.engineVersion || LONGHORN_VERSION_V1,
+          lvmVolumeGroup:     blockDevice?.spec?.provisioner?.lvm?.vgName,
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         };
       });
 
@@ -193,7 +258,11 @@ export default {
     },
 
     showFormattedWarning() {
+<<<<<<< HEAD
       const out = this.newDisks.filter(d => d.forceFormatted && d.isNew) || [];
+=======
+      const out = this.newDisks.filter(d => d.forceFormatted && d.isNew && d.provisionerVersion === LONGHORN_VERSION_V1) || [];
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
       return out.length > 0;
     },
@@ -312,6 +381,7 @@ export default {
 
       this.newDisks.push({
         name,
+<<<<<<< HEAD
         path:              mountPoint,
         allowScheduling:   false,
         evictionRequested: false,
@@ -321,6 +391,20 @@ export default {
         blockDevice:       disk,
         displayName:       disk?.displayName,
         forceFormatted,
+=======
+        path:               mountPoint,
+        allowScheduling:    false,
+        evictionRequested:  false,
+        storageReserved:    0,
+        isNew:              true,
+        originPath:         disk?.spec?.fileSystem?.mountPoint,
+        blockDevice:        disk,
+        displayName:        disk?.displayName,
+        forceFormatted,
+        provisioner:        LONGHORN_DRIVER,
+        provisionerVersion: LONGHORN_VERSION_V1,
+        lvmVolumeGroup:     null,
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       });
     },
 
@@ -334,6 +418,7 @@ export default {
       } else if (addDisks.length !== 0 && removeDisks.length === 0) {
         const updatedDisks = addDisks.filter((d) => {
           const blockDevice = this.$store.getters[`${ inStore }/byId`](HCI.BLOCK_DEVICE, `${ LONGHORN_SYSTEM }/${ d.name }`);
+<<<<<<< HEAD
           const { provisioned, forceFormatted } = blockDevice.spec.fileSystem;
 
           if (provisioned && forceFormatted === d.forceFormatted) {
@@ -341,6 +426,12 @@ export default {
           } else {
             return true;
           }
+=======
+          const { forceFormatted } = blockDevice.spec.fileSystem;
+          const { provisioner } = blockDevice.spec;
+
+          return !(blockDevice.isProvisioned && forceFormatted === d.forceFormatted && isEqual(provisioner, d.provisioner));
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         });
 
         if (updatedDisks.length === 0) {
@@ -352,16 +443,35 @@ export default {
         await Promise.all(addDisks.map((d) => {
           const blockDevice = this.$store.getters[`${ inStore }/byId`](HCI.BLOCK_DEVICE, `${ LONGHORN_SYSTEM }/${ d.name }`);
 
+<<<<<<< HEAD
           blockDevice.spec.fileSystem.provisioned = true;
           blockDevice.spec.fileSystem.forceFormatted = d.forceFormatted;
 
+=======
+          blockDevice.spec.provision = true;
+          blockDevice.spec.fileSystem.forceFormatted = d.forceFormatted;
+
+          switch (d.provisioner) {
+          case LONGHORN_DRIVER:
+            blockDevice.spec.provisioner = { longhorn: { engineVersion: d.provisionerVersion } };
+            break;
+          case LVM_DRIVER:
+            blockDevice.spec.provisioner = { lvm: { vgName: d.lvmVolumeGroup } };
+            break;
+          }
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
           return blockDevice.save();
         }));
 
         await Promise.all(removeDisks.map((d) => {
           const blockDevice = this.$store.getters[`${ inStore }/byId`](HCI.BLOCK_DEVICE, `${ LONGHORN_SYSTEM }/${ d.name }`);
 
+<<<<<<< HEAD
           blockDevice.spec.fileSystem.provisioned = false;
+=======
+          blockDevice.spec.provision = false;
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
           return blockDevice.save();
         }));
@@ -414,7 +524,11 @@ export default {
           if ((!findBy(this.disks || [], 'name', d.metadata.name) &&
                 d?.spec?.nodeName === this.value.id &&
                 (!addedToNodeCondition || addedToNodeCondition?.status === 'False') &&
+<<<<<<< HEAD
                 !d.spec?.fileSystem?.provisioned &&
+=======
+                !d?.isProvisioned &&
+>>>>>>> b5455bcb (fix: separate used/allocated units)
                 !isAdded) ||
                 isRemoved
           ) {
@@ -506,7 +620,13 @@ export default {
         }
       };
 
+<<<<<<< HEAD
       await retrySave();
+=======
+      if (this.longhornNode) {
+        await retrySave();
+      }
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     },
   },
 };
@@ -566,6 +686,10 @@ export default {
                 class="mb-20"
                 :mode="mode"
                 :disks="disks"
+<<<<<<< HEAD
+=======
+                :node="value"
+>>>>>>> b5455bcb (fix: separate used/allocated units)
               />
             </template>
             <template #add>
diff --git a/pkg/harvester/edit/harvesterhci.io.keypair.vue b/pkg/harvester/edit/harvesterhci.io.keypair.vue
index 0d47aab6ccc..362782ba779 100644
--- a/pkg/harvester/edit/harvesterhci.io.keypair.vue
+++ b/pkg/harvester/edit/harvesterhci.io.keypair.vue
@@ -44,6 +44,7 @@ export default {
 
   watch: {
     publicKey(neu) {
+<<<<<<< HEAD
       this.value.spec.publicKey = neu;
 
       const splitSSH = neu.split(/\s+/);
@@ -53,6 +54,19 @@ export default {
           this.value.metadata.name = splitSSH[2].split('@')[0];
           this.randomString = randomStr(10).toLowerCase();
         }
+=======
+      const trimNeu = neu.trim();
+
+      this.value.spec.publicKey = trimNeu;
+
+      const splitSSH = trimNeu.split(/\s+/);
+
+      if (splitSSH.length === 3 && !this.value.metadata.name) {
+        const keyComment = splitSSH[2];
+
+        this.randomString = randomStr(10).toLowerCase();
+        this.value.metadata.name = keyComment.includes('@') ? keyComment.split('@')[0] : keyComment;
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       }
     }
   },
diff --git a/pkg/harvester/edit/harvesterhci.io.logging.output.vue b/pkg/harvester/edit/harvesterhci.io.logging.output.vue
index 495d5326e1c..b2974de995e 100644
--- a/pkg/harvester/edit/harvesterhci.io.logging.output.vue
+++ b/pkg/harvester/edit/harvesterhci.io.logging.output.vue
@@ -1,6 +1,10 @@
 <script>
 import CreateEditView from '@shell/mixins/create-edit-view';
+<<<<<<< HEAD
 import { SECRET, LOGGING, SCHEMA } from '@shell/config/types';
+=======
+import { LOGGING, SCHEMA } from '@shell/config/types';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 import Tabbed from '@shell/components/Tabbed';
 import Tab from '@shell/components/Tabbed/Tab';
 import CruResource from '@shell/components/CruResource';
@@ -30,12 +34,52 @@ export default {
   mixins: [CreateEditView],
 
   async fetch() {
+<<<<<<< HEAD
     await this.$store.dispatch('harvester/findAll', { type: SECRET });
   },
 
   data() {
     const schemas = this.$store.getters['harvester/all'](SCHEMA);
 
+=======
+    const schemas = this.$store.getters['harvester/all'](SCHEMA);
+
+    const resourceSchema = this.$store.getters['harvester/byId'](SCHEMA, LOGGING.OUTPUT);
+
+    const schemaDefinition = await resourceSchema.fetchResourceFields();
+
+    let bufferYaml = '';
+
+    if ( !isEmpty(this.value.spec[this.selectedProvider]?.buffer) ) {
+      bufferYaml = jsyaml.dump(this.value.spec[this.selectedProvider].buffer);
+    } else if (schemaDefinition) {
+      bufferYaml = createYaml(
+        schemas,
+        `io.banzaicloud.logging.v1beta1.Output.spec.${ this.selectedProvider }.buffer`,
+        {},
+        true,
+        1,
+        '',
+        LOGGING.OUTPUT
+      );
+
+      // createYaml doesn't support passing reference types (array, map) as the first type. As such
+      // I'm manipulating the output since I'm not sure it's something we want to actually support
+      // seeing as it's really createResourceYaml and this here is a gray area between spoofed types
+      // and just a field within a spec.
+      bufferYaml = bufferYaml.substring(bufferYaml.indexOf('\n') + 1).replace(/# {2}/g, '#');
+    }
+
+    if (bufferYaml.length) {
+      this.bufferYaml = bufferYaml;
+      this.initialBufferYaml = bufferYaml;
+
+      this.$refs.yaml.updateValue(this.bufferYaml);
+    }
+  },
+
+  data() {
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     if (this.isCreate) {
       this.value.metadata.namespace = 'default';
     }
@@ -65,6 +109,7 @@ export default {
 
     const selectedProvider = selectedProviders?.[0]?.value || providers[0].value;
 
+<<<<<<< HEAD
     let bufferYaml;
 
     if ( !isEmpty(this.value.spec[selectedProvider]?.buffer) ) {
@@ -81,6 +126,11 @@ export default {
     return {
       bufferYaml,
       initialBufferYaml:            bufferYaml,
+=======
+    return {
+      bufferYaml:                   '',
+      initialBufferYaml:            '',
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       providers,
       selectedProvider,
       hasMultipleProvidersSelected: selectedProviders.length > 1,
diff --git a/pkg/harvester/edit/harvesterhci.io.schedulevmbackup.vue b/pkg/harvester/edit/harvesterhci.io.schedulevmbackup.vue
new file mode 100644
index 00000000000..c6c174d4e7e
--- /dev/null
+++ b/pkg/harvester/edit/harvesterhci.io.schedulevmbackup.vue
@@ -0,0 +1,299 @@
+<script>
+import { RadioGroup } from '@components/Form/Radio';
+import { Banner } from '@components/Banner';
+import { LabeledInput } from '@components/Form/LabeledInput';
+import CruResource from '@shell/components/CruResource';
+import Tabbed from '@shell/components/Tabbed';
+import Tab from '@shell/components/Tabbed/Tab';
+import MessageLink from '@shell/components/MessageLink';
+import LabeledSelect from '@shell/components/form/LabeledSelect';
+import CreateEditView from '@shell/mixins/create-edit-view';
+import { isCronValid } from '@pkg/harvester/utils/cron';
+import { PRODUCT_NAME as HARVESTER_PRODUCT } from '@pkg/harvester/config/harvester';
+import { allHash } from '@shell/utils/promise';
+import { HCI } from '../types';
+import { sortBy } from '@shell/utils/sort';
+import { BACKUP_TYPE } from '../config/types';
+import { _EDIT, _CREATE } from '@shell/config/query-params';
+
+export default {
+  name:       'CreateVMSchedule',
+  components: {
+    CruResource,
+    Tabbed,
+    Tab,
+    RadioGroup,
+    LabeledInput,
+    LabeledSelect,
+    MessageLink,
+    Banner,
+  },
+
+  mixins: [CreateEditView],
+
+  async fetch() {
+    const hash = await allHash({
+      settings: this.$store.dispatch('harvester/findAll', { type: HCI.SETTING }),
+      vms:      this.$store.dispatch('harvester/findAll', { type: HCI.VM }),
+    });
+
+    this.allVms = hash.vms;
+    this.settings = hash.settings;
+  },
+
+  props: {
+    value: {
+      type:     Object,
+      required: true,
+    },
+    mode: {
+      type:     String,
+      required: true,
+    }
+  },
+
+  data() {
+    if (this.mode === _CREATE) {
+      const defaultNs = this.$store.getters['defaultNamespace'];
+      const vmNamespace = this.$route.query?.vmNamespace || defaultNs;
+      const vmName = this.$route.query?.vmName;
+
+      delete this.value.metadata.annotations;
+      delete this.value.metadata.labels;
+      // set value.metadata
+      this.$set(this.value, 'metadata', {
+        namespace: vmNamespace,
+        name:      vmName ? `svmbackup-${ vmName }` : ''
+      });
+      // set value.spec
+      if (!this.value.spec) {
+        this.$set(this.value, 'spec', {
+          cron:       '',
+          retain:     8,
+          maxFailure: 4,
+        });
+        // set value.spec.vmbackup
+        this.$set(this.value.spec, 'vmbackup', {
+          source: {
+            apiGroup: 'kubevirt.io',
+            kind:     'VirtualMachine',
+            name:     vmName || ''
+          },
+          type: BACKUP_TYPE.BACKUP
+        });
+      }
+    }
+
+    return { settings: [] };
+  },
+
+  computed: {
+    backupTargetResource() {
+      return this.settings.find( O => O.id === 'backup-target');
+    },
+    isEmptyValue() {
+      return this.getBackupTargetValueIsEmpty(this.backupTargetResource);
+    },
+    canUpdate() {
+      return this?.backupTargetResource?.canUpdate;
+    },
+    errorMessage() {
+      return this.backupTargetResource?.errMessage;
+    },
+    canSave() {
+      return !!this.value.spec.cron && isCronValid(this.value.spec.cron) &&
+      !!this.value.metadata.name &&
+      !!this.value.metadata.namespace &&
+      !!this.value.spec.retain &&
+      !!this.value.spec.maxFailure;
+    },
+    isBackupTargetUnAvailable() {
+      return this.value.spec.vmbackup.type === BACKUP_TYPE.BACKUP && (this.errorMessage || this.isEmptyValue) && this.canUpdate;
+    },
+    vmOptions() {
+      const nsVmList = this.$store.getters['harvester/all'](HCI.VM).filter(vm => vm.metadata.namespace === this.value.metadata.namespace);
+      const vmObjectLists = nsVmList.map(obj => ({
+        label: obj.nameDisplay,
+        value: obj.name,
+      }));
+
+      return sortBy(vmObjectLists, 'label');
+    },
+
+    namespaces() {
+      const allNamespaces = this.$store.getters['allNamespaces'];
+      const out = sortBy(
+        allNamespaces.map((obj) => {
+          return {
+            label: obj.nameDisplay,
+            value: obj.id,
+          };
+        }),
+        'label'
+      );
+
+      return out;
+    },
+    toBackupTargetSetting() {
+      const { cluster } = this.$router?.currentRoute?.params || {};
+
+      return {
+        name:   `${ HARVESTER_PRODUCT }-c-cluster-resource-id`,
+        params: {
+          resource: `${ HCI.SETTING }`,
+          cluster,
+          id:       'backup-target'
+        },
+        query: { mode: _EDIT }
+      };
+    },
+    scheduleTypeOptions() {
+      return [BACKUP_TYPE.BACKUP, BACKUP_TYPE.SNAPSHOT];
+    }
+  },
+
+  watch: {
+    'value.metadata.namespace'() {
+      this.value.spec.vmbackup.source.name = '';
+    },
+    'value.spec.vmbackup.source.name'(neu) {
+      this.value.metadata.name = `svm${ this.value.spec.vmbackup.type }-${ neu }`;
+    }
+  },
+
+  methods: {
+    onTypeChange(newType) {
+      this.value.metadata.name = `svm${ newType }-${ this.value.spec.vmbackup.source.name }`;
+    },
+    getBackupTargetValueIsEmpty(resource) {
+      let out = true;
+
+      if (resource?.value) {
+        try {
+          const valueJson = JSON.parse(resource?.value);
+
+          out = !valueJson.type;
+        } catch (e) {}
+      }
+
+      return out;
+    },
+
+    validateFailure(count) {
+      if (this.value.spec.retain && count > this.value.spec.retain) {
+        this.$set(this.value.spec, 'maxFailure', this.value.spec.retain);
+      }
+    },
+  },
+};
+</script>
+
+<template>
+  <CruResource
+    :done-route="doneRoute"
+    :resource="value"
+    :mode="mode"
+    :errors="errors"
+    :apply-hooks="applyHooks"
+    :validationPassed="canSave"
+    @finish="save"
+    @error="e=>errors = e"
+  >
+    <div class="banner">
+      <Banner
+        v-if="isBackupTargetUnAvailable"
+        color="error"
+      >
+        <MessageLink
+          v-if="isEmptyValue"
+          :to="toBackupTargetSetting"
+          :target="_blank"
+          prefix-label="harvester.backup.message.noSetting.prefix"
+          middle-label="harvester.backup.message.noSetting.middle"
+          suffix-label="harvester.schedule.message.noSetting.suffix"
+        />
+        <MessageLink
+          v-else
+          :to="toBackupTargetSetting"
+          prefix-label="harvester.backup.message.errorTip.prefix"
+          middle-label="harvester.backup.message.errorTip.middle"
+        >
+          <template v-slot:suffix>
+            {{ t('harvester.backup.message.errorTip.suffix') }} {{ errorMessage }}
+          </template>
+        </MessageLink>
+      </Banner>
+      <div class="mb-30">
+        <RadioGroup
+          v-model="value.spec.vmbackup.type"
+          name="model"
+          :options="scheduleTypeOptions"
+          :labels="[t('harvester.schedule.type.backup'), t('harvester.schedule.type.snapshot')]"
+          :disabled="isEdit || isView"
+          :mode="mode"
+          row
+          @input="onTypeChange"
+        />
+      </div>
+      <div class="row mb-30">
+        <div class="col span-6">
+          <LabeledSelect
+            v-model="value.metadata.namespace"
+            :label="t('nameNsDescription.namespace.label')"
+            :options="namespaces"
+            required
+            :disabled="isBackupTargetUnAvailable || isEdit || isView"
+          />
+        </div>
+        <div class="col span-6">
+          <LabeledSelect
+            v-model="value.spec.vmbackup.source.name"
+            :label="t('harvester.schedule.virtualMachine.title')"
+            :placeholder="t('harvester.schedule.virtualMachine.placeholder')"
+            :options="vmOptions"
+            required
+            :disabled="isBackupTargetUnAvailable || isEdit || isView"
+          />
+        </div>
+      </div>
+    </div>
+    <Tabbed v-bind="$attrs" class="mt-15" :side-tabs="true">
+      <Tab name="basics" :label="t('harvester.network.tabs.basics')" :weight="99" class="bordered-table">
+        <LabeledInput
+          v-model="value.spec.cron"
+          class="mb-30"
+          type="cron"
+          required
+          :mode="mode"
+          :label="t('harvester.schedule.cron')"
+          placeholder="0 * * * *"
+          :disabled="isBackupTargetUnAvailable || isView"
+        />
+        <LabeledInput
+          v-model.number="value.spec.retain"
+          v-int-number
+          class="mb-30"
+          :min="2"
+          :max="250"
+          type="number"
+          :label="t('harvester.schedule.retain.label')"
+          required
+          :tooltip="t('harvester.schedule.retain.tooltip')"
+          :disabled="isBackupTargetUnAvailable || isView"
+        />
+        <LabeledInput
+          v-model.number="value.spec.maxFailure"
+          v-int-number
+          class="mb-30"
+          :min="2"
+          type="number"
+          :label="t('harvester.schedule.maxFailure.label')"
+          required
+          :tooltip="t('harvester.schedule.maxFailure.tooltip')"
+          :disabled="isBackupTargetUnAvailable || isView"
+          @input="validateFailure"
+        />
+      </Tab>
+    </Tabbed>
+  </CruResource>
+</template>
diff --git a/pkg/harvester/edit/harvesterhci.io.storage/index.vue b/pkg/harvester/edit/harvesterhci.io.storage/index.vue
index 34dbc90bf17..ad505648688 100644
--- a/pkg/harvester/edit/harvesterhci.io.storage/index.vue
+++ b/pkg/harvester/edit/harvesterhci.io.storage/index.vue
@@ -14,12 +14,29 @@ import Loading from '@shell/components/Loading';
 
 import { _CREATE, _VIEW } from '@shell/config/query-params';
 import { mapFeature, UNSUPPORTED_STORAGE_DRIVERS } from '@shell/store/features';
+<<<<<<< HEAD
 import { STORAGE_CLASS, LONGHORN } from '@shell/config/types';
 import { CSI_DRIVER } from '../../types';
 import { allHash } from '@shell/utils/promise';
 import { clone } from '@shell/utils/object';
 
 const LONGHORN_DRIVER = 'driver.longhorn.io';
+=======
+import { STORAGE_CLASS, LONGHORN, SECRET, NAMESPACE } from '@shell/config/types';
+import { CSI_DRIVER } from '../../types';
+import { allHash } from '@shell/utils/promise';
+import { clone } from '@shell/utils/object';
+import { LONGHORN_DRIVER } from '@shell/models/persistentvolume';
+import { LVM_DRIVER } from '../../models/harvester/storage.k8s.io.storageclass';
+import { DATA_ENGINE_V1, DATA_ENGINE_V2 } from '../../models/harvester/persistentvolumeclaim';
+
+const LONGHORN_V2_DATA_ENGINE = 'longhorn-system/v2-data-engine';
+
+export const LVM_TOPOLOGY_LABEL = 'topology.lvm.csi/node';
+
+const VOLUME_BINDING_MODE_IMMEDIATE = 'Immediate';
+const VOLUME_BINDING_MODE_WAIT = 'WaitForFirstConsumer';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 export default {
   name: 'HarvesterStorage',
@@ -62,6 +79,7 @@ export default {
     const volumeBindingModeOptions = [
       {
         label: this.t('storageClass.customize.volumeBindingMode.now'),
+<<<<<<< HEAD
         value: 'Immediate'
       },
       {
@@ -71,31 +89,73 @@ export default {
     ];
 
     const allowedTopologies = clone(this.value.allowedTopologies?.[0]?.matchLabelExpressions || []);
+=======
+        value: VOLUME_BINDING_MODE_IMMEDIATE
+      },
+      {
+        label: this.t('harvester.storage.customize.volumeBindingMode.later'),
+        value: VOLUME_BINDING_MODE_WAIT
+      }
+    ];
+
+    const allowedTopologies = clone(this.value.allowedTopologies?.[0]?.matchLabelExpressions || []).filter(t => t.key !== LVM_TOPOLOGY_LABEL);
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
     this.$set(this.value, 'parameters', this.value.parameters || {});
     this.$set(this.value, 'provisioner', this.value.provisioner || LONGHORN_DRIVER);
     this.$set(this.value, 'allowVolumeExpansion', this.value.allowVolumeExpansion || allowVolumeExpansionOptions[0].value);
     this.$set(this.value, 'reclaimPolicy', this.value.reclaimPolicy || reclaimPolicyOptions[0].value);
+<<<<<<< HEAD
     this.$set(this.value, 'volumeBindingMode', this.value.volumeBindingMode || volumeBindingModeOptions[0].value);
 
     return {
+=======
+
+    if (this.value.provisioner === LONGHORN_DRIVER) {
+      this.$set(this.value.parameters, 'dataEngine', this.value.longhornVersion);
+      this.$set(this.value, 'volumeBindingMode', this.value.volumeBindingMode || VOLUME_BINDING_MODE_IMMEDIATE);
+    }
+
+    if (this.value.provisioner === LVM_DRIVER) {
+      this.$set(this.value, 'volumeBindingMode', this.value.volumeBindingMode || VOLUME_BINDING_MODE_WAIT);
+    }
+
+    let provisioner = `${ this.value.provisioner || LONGHORN_DRIVER }`;
+
+    if (provisioner === LONGHORN_DRIVER) {
+      provisioner = `${ provisioner }_${ this.value.longhornVersion }`;
+    }
+
+    return {
+      LVM_DRIVER,
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       reclaimPolicyOptions,
       allowVolumeExpansionOptions,
       volumeBindingModeOptions,
       mountOptions:    [],
+<<<<<<< HEAD
       provisioner:     LONGHORN_DRIVER,
       STORAGE_CLASS,
+=======
+      STORAGE_CLASS,
+      provisioner,
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       allowedTopologies,
       defaultAddValue: {
         key:    '',
         values: [],
+<<<<<<< HEAD
       }
+=======
+      },
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     };
   },
 
   async fetch() {
     const inStore = this.$store.getters['currentProduct'].inStore;
 
+<<<<<<< HEAD
     const hash = {
       storages:      this.$store.dispatch(`${ inStore }/findAll`, { type: STORAGE_CLASS }),
       longhornNodes: this.$store.dispatch(`${ inStore }/findAll`, { type: LONGHORN.NODES }),
@@ -103,6 +163,16 @@ export default {
     };
 
     await allHash(hash);
+=======
+    await allHash({
+      namespaces:           this.$store.dispatch(`${ inStore }/findAll`, { type: NAMESPACE }),
+      secrets:              this.$store.dispatch(`${ inStore }/findAll`, { type: SECRET }),
+      storages:             this.$store.dispatch(`${ inStore }/findAll`, { type: STORAGE_CLASS }),
+      longhornNodes:        this.$store.dispatch(`${ inStore }/findAll`, { type: LONGHORN.NODES }),
+      csiDrivers:           this.$store.dispatch(`${ inStore }/findAll`, { type: CSI_DRIVER }),
+      longhornV2DataEngine: this.$store.dispatch(`${ inStore }/find`, { type: LONGHORN.SETTINGS, id: LONGHORN_V2_DATA_ENGINE }),
+    });
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   },
 
   computed: {
@@ -116,6 +186,7 @@ export default {
       return this.isCreate ? _CREATE : _VIEW;
     },
 
+<<<<<<< HEAD
     provisionerWatch() {
       return this.value.provisioner;
     },
@@ -130,6 +201,39 @@ export default {
           value: provisioner.name,
         };
       });
+=======
+    provisioners() {
+      const out = [];
+
+      const inStore = this.$store.getters['currentProduct'].inStore;
+      const csiDrivers = this.$store.getters[`${ inStore }/all`](CSI_DRIVER) || [];
+
+      csiDrivers.forEach(({ name }) => {
+        switch (name) {
+        case LONGHORN_DRIVER:
+          out.push({
+            label: `harvester.storage.storageClass.longhorn.${ DATA_ENGINE_V1 }.label`,
+            value: `${ name }_${ DATA_ENGINE_V1 }`,
+          });
+
+          if (this.longhornSystemVersion === DATA_ENGINE_V2 || this.value.longhornVersion === DATA_ENGINE_V2) {
+            out.push({
+              label: `harvester.storage.storageClass.longhorn.${ DATA_ENGINE_V2 }.label`,
+              value: `${ name }_${ DATA_ENGINE_V2 }`,
+            });
+          }
+          break;
+        case LVM_DRIVER:
+          out.push({
+            label: 'harvester.storage.storageClass.lvm.label',
+            value: name,
+          });
+          break;
+        }
+      });
+
+      return out;
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     },
 
     schema() {
@@ -137,6 +241,7 @@ export default {
 
       return this.$store.getters[`${ inStore }/schemaFor`](STORAGE_CLASS);
     },
+<<<<<<< HEAD
   },
 
   watch: {
@@ -146,6 +251,47 @@ export default {
   },
 
   created() {
+=======
+
+    longhornSystemVersion() {
+      const inStore = this.$store.getters['currentProduct'].inStore;
+      const v2DataEngine = this.$store.getters[`${ inStore }/byId`](LONGHORN.SETTINGS, LONGHORN_V2_DATA_ENGINE) || {};
+
+      return v2DataEngine.value === 'true' ? DATA_ENGINE_V2 : DATA_ENGINE_V1;
+    },
+  },
+
+  watch: {
+    provisioner(neu) {
+      const [provisioner, dataEngine] = neu?.split('_');
+
+      let parameters = {};
+
+      if (provisioner === LVM_DRIVER) {
+        const matchLabelExpressions = (this.value.allowedTopologies?.[0]?.matchLabelExpressions || []).filter(t => t.key !== LVM_TOPOLOGY_LABEL);
+
+        if (matchLabelExpressions.length > 0) {
+          this.$set(this.value, 'allowedTopologies', [{ matchLabelExpressions }]);
+        } else {
+          delete this.value.allowedTopologies;
+        }
+
+        this.$set(this.value, 'volumeBindingMode', VOLUME_BINDING_MODE_WAIT);
+      }
+
+      if (provisioner === LONGHORN_DRIVER) {
+        parameters = { dataEngine };
+        this.$set(this.value, 'volumeBindingMode', VOLUME_BINDING_MODE_IMMEDIATE);
+      }
+
+      this.$set(this.value, 'provisioner', provisioner);
+      this.$set(this.value, 'allowVolumeExpansion', this.value.provisioner === LONGHORN_DRIVER);
+      this.$set(this.value, 'parameters', parameters);
+    }
+  },
+
+  created(neu) {
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     this.registerBeforeHook(this.willSave, 'willSave');
   },
 
@@ -158,11 +304,14 @@ export default {
       }
     },
 
+<<<<<<< HEAD
     updateProvisioner(provisioner) {
       this.$set(this.value, 'provisioner', provisioner);
       this.$set(this.value, 'allowVolumeExpansion', provisioner === LONGHORN_DRIVER);
     },
 
+=======
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     willSave() {
       Object.keys(this.value.parameters).forEach((key) => {
         if (this.value.parameters[key] === null || this.value.parameters[key] === '') {
@@ -174,10 +323,22 @@ export default {
     },
 
     formatAllowedTopoloties() {
+<<<<<<< HEAD
       const neu = this.allowedTopologies;
 
       if (!neu || neu.length === 0) {
         delete this.value.allowedTopologies;
+=======
+      const neu = this.allowedTopologies.filter(t => t.key !== LVM_TOPOLOGY_LABEL);
+      const lvmMatchExpression = (this.value.allowedTopologies?.[0]?.matchLabelExpressions || []).filter(t => t.key === LVM_TOPOLOGY_LABEL);
+
+      if (!neu || neu.length === 0) {
+        if (lvmMatchExpression.length > 0) {
+          this.value.allowedTopologies = [{ matchLabelExpressions: lvmMatchExpression }];
+        } else {
+          delete this.value.allowedTopologies;
+        }
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
         return;
       }
@@ -185,7 +346,11 @@ export default {
       const matchLabelExpressions = neu.filter(R => !!R.key.trim() && (R.values.length > 0 && !R.values.find(V => !V.trim())));
 
       if (matchLabelExpressions.length > 0) {
+<<<<<<< HEAD
         this.value.allowedTopologies = [{ matchLabelExpressions }];
+=======
+        this.value.allowedTopologies = [{ matchLabelExpressions: [...matchLabelExpressions, ...lvmMatchExpression] }];
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       }
     }
   }
@@ -214,7 +379,11 @@ export default {
       :register-before-hook="registerBeforeHook"
     />
     <LabeledSelect
+<<<<<<< HEAD
       :value="value.provisioner"
+=======
+      v-model="provisioner"
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       label="Provisioner"
       :options="provisioners"
       :localized-label="true"
@@ -222,13 +391,21 @@ export default {
       :searchable="true"
       :taggable="true"
       class="mb-20"
+<<<<<<< HEAD
       @input="updateProvisioner($event)"
+=======
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     />
     <Tabbed :side-tabs="true">
       <Tab name="parameters" :label="t('storageClass.parameters.label')" :weight="2">
         <component
+<<<<<<< HEAD
           :is="getComponent(value.provisioner)"
           :key="value.provisioner"
+=======
+          :is="getComponent(provisioner)"
+          :key="provisioner"
+>>>>>>> b5455bcb (fix: separate used/allocated units)
           :value="value"
           :mode="modeOverride"
           :real-mode="realMode"
@@ -263,6 +440,10 @@ export default {
               :label="t('storageClass.customize.volumeBindingMode.label')"
               :mode="modeOverride"
               :options="volumeBindingModeOptions"
+<<<<<<< HEAD
+=======
+              :disabled="provisioner === LVM_DRIVER"
+>>>>>>> b5455bcb (fix: separate used/allocated units)
             />
           </div>
         </div>
diff --git a/pkg/harvester/edit/harvesterhci.io.storage/provisioners/driver.longhorn.io_v1.vue b/pkg/harvester/edit/harvesterhci.io.storage/provisioners/driver.longhorn.io_v1.vue
new file mode 100644
index 00000000000..d41f914fd27
--- /dev/null
+++ b/pkg/harvester/edit/harvesterhci.io.storage/provisioners/driver.longhorn.io_v1.vue
@@ -0,0 +1,350 @@
+<script>
+import KeyValue from '@shell/components/form/KeyValue';
+import LabeledSelect from '@shell/components/form/LabeledSelect';
+import { LabeledInput } from '@components/Form/LabeledInput';
+import RadioGroup from '@components/Form/Radio/RadioGroup';
+import { SECRET, LONGHORN } from '@shell/config/types';
+import { _CREATE, _VIEW } from '@shell/config/query-params';
+import { CSI_SECRETS } from '@pkg/harvester/config/harvester-map';
+import { clone } from '@shell/utils/object';
+import { uniq } from '@shell/utils/array';
+import { DATA_ENGINE_V1 } from '../../../models/harvester/persistentvolumeclaim';
+
+// UI components for Longhorn storage class parameters
+const DEFAULT_PARAMETERS = [
+  'numberOfReplicas',
+  'staleReplicaTimeout',
+  'diskSelector',
+  'nodeSelector',
+  'migratable',
+  'encrypted',
+  'dataEngine',
+];
+
+const {
+  CSI_PROVISIONER_SECRET_NAME,
+  CSI_PROVISIONER_SECRET_NAMESPACE,
+  CSI_NODE_PUBLISH_SECRET_NAME,
+  CSI_NODE_PUBLISH_SECRET_NAMESPACE,
+  CSI_NODE_STAGE_SECRET_NAME,
+  CSI_NODE_STAGE_SECRET_NAMESPACE
+} = CSI_SECRETS;
+
+export default {
+  name: 'DriverLonghornIOV1',
+
+  components: {
+    KeyValue,
+    LabeledSelect,
+    LabeledInput,
+    RadioGroup,
+  },
+
+  props: {
+    value: {
+      type:     Object,
+      required: true
+    },
+    mode: {
+      type:     String,
+      required: true
+    },
+    realMode: {
+      type:     String,
+      required: true
+    },
+  },
+
+  data() {
+    if (this.realMode === _CREATE) {
+      this.$set(this.value, 'parameters', {
+        numberOfReplicas:    '3',
+        staleReplicaTimeout: '30',
+        diskSelector:        null,
+        nodeSelector:        null,
+        encrypted:           'false',
+        migratable:          'true',
+        dataEngine:          DATA_ENGINE_V1
+      });
+    }
+
+    return { };
+  },
+
+  computed: {
+    secrets() {
+      const inStore = this.$store.getters['currentProduct'].inStore;
+
+      const allSecrets = this.$store.getters[`${ inStore }/all`](SECRET);
+
+      // only show non-system secret to user to select
+      return allSecrets.filter(secret => secret.isSystem === false);
+    },
+
+    longhornNodes() {
+      const inStore = this.$store.getters['currentProduct'].inStore;
+
+      return this.$store.getters[`${ inStore }/all`](LONGHORN.NODES);
+    },
+
+    nodeTags() {
+      return (this.longhornNodes || []).reduce((sum, node) => {
+        const tags = node.spec?.tags || [];
+
+        return uniq([...sum, ...tags]);
+      }, []);
+    },
+
+    diskTags() {
+      return (this.longhornNodes || []).reduce((sum, node) => {
+        const disks = node.spec?.disks;
+
+        const tagsOfNode = Object.keys(disks).reduce((sum, key) => {
+          const tags = disks[key]?.tags || [];
+
+          return uniq([...sum, ...tags]);
+        }, []);
+
+        return uniq([...sum, ...tagsOfNode]);
+      }, []);
+    },
+
+    isView() {
+      return this.mode === _VIEW;
+    },
+
+    migratableOptions() {
+      return [{
+        label: this.t('generic.yes'),
+        value: 'true'
+      }, {
+        label: this.t('generic.no'),
+        value: 'false'
+      }];
+    },
+
+    secretOptions() {
+      return this.secrets.map(secret => secret.id);
+    },
+
+    volumeEncryptionOptions() {
+      return [{
+        label: this.t('generic.yes'),
+        value: 'true'
+      }, {
+        label: this.t('generic.no'),
+        value: 'false'
+      }];
+    },
+
+    parameters: {
+      get() {
+        const parameters = clone(this.value?.parameters) || {};
+
+        DEFAULT_PARAMETERS.forEach((key) => {
+          delete parameters[key];
+        });
+
+        Object.values(CSI_SECRETS).forEach((key) => {
+          delete parameters[key];
+        });
+
+        return parameters;
+      },
+
+      set(value) {
+        Object.assign(this.value.parameters, value);
+      }
+    },
+
+    volumeEncryption: {
+      set(neu) {
+        this.$set(this.value, 'parameters', {
+          ...this.value.parameters,
+          encrypted: neu
+        });
+      },
+
+      get() {
+        return this.value?.parameters?.encrypted || 'false';
+      }
+    },
+
+    secret: {
+      get() {
+        const selectedNs = this.value.parameters[CSI_PROVISIONER_SECRET_NAMESPACE];
+        const selectedName = this.value.parameters[CSI_PROVISIONER_SECRET_NAME];
+
+        if (selectedNs && selectedName) {
+          return `${ selectedNs }/${ selectedName }`;
+        }
+
+        return '';
+      },
+
+      set(selectedSecret) {
+        const [namespace, name] = selectedSecret.split('/');
+
+        this.$set(this.value, 'parameters', {
+          ...this.value.parameters,
+          [CSI_PROVISIONER_SECRET_NAME]:       name,
+          [CSI_NODE_PUBLISH_SECRET_NAME]:      name,
+          [CSI_NODE_STAGE_SECRET_NAME]:        name,
+          [CSI_PROVISIONER_SECRET_NAMESPACE]:  namespace,
+          [CSI_NODE_PUBLISH_SECRET_NAMESPACE]: namespace,
+          [CSI_NODE_STAGE_SECRET_NAMESPACE]:   namespace
+        });
+      }
+    },
+
+    nodeSelector: {
+      get() {
+        const nodeSelector = this.value?.parameters?.nodeSelector;
+
+        if ((nodeSelector || '').includes(',')) {
+          return nodeSelector.split(',');
+        } else if (nodeSelector) {
+          return [nodeSelector];
+        } else {
+          return [];
+        }
+      },
+
+      set(value) {
+        this.value.parameters.nodeSelector = (value || []).join(',');
+      }
+    },
+
+    diskSelector: {
+      get() {
+        const diskSelector = this.value?.parameters?.diskSelector;
+
+        if ((diskSelector || '').includes(',')) {
+          return diskSelector.split(',');
+        } else if (diskSelector) {
+          return [diskSelector];
+        } else {
+          return [];
+        }
+      },
+
+      set(value) {
+        this.value.parameters.diskSelector = (value || []).join(',');
+      }
+    },
+
+    numberOfReplicas: {
+      get() {
+        return this.value?.parameters?.numberOfReplicas;
+      },
+
+      set(value) {
+        if (value >= 1 && value <= 3) {
+          this.value.parameters.numberOfReplicas = String(value);
+        }
+      }
+    },
+  },
+};
+</script>
+<template>
+  <div>
+    <div class="row">
+      <div class="col span-6">
+        <LabeledInput
+          v-model="numberOfReplicas"
+          :label="t('harvester.storage.parameters.numberOfReplicas.label')"
+          :required="true"
+          :mode="mode"
+          min="1"
+          max="3"
+          type="number"
+        />
+      </div>
+      <div class="col span-6">
+        <LabeledInput
+          v-model="value.parameters.staleReplicaTimeout"
+          :label="t('harvester.storage.parameters.staleReplicaTimeout.label')"
+          :required="true"
+          :mode="mode"
+          type="number"
+        />
+      </div>
+    </div>
+    <div class="row mt-10">
+      <div class="col span-6">
+        <LabeledSelect
+          v-model="nodeSelector"
+          :label="t('harvester.storage.parameters.nodeSelector.label')"
+          :options="nodeTags"
+          :taggable="true"
+          :multiple="true"
+          :mode="mode"
+        >
+          <template #no-options="{ searching }">
+            <span v-if="!searching" class="text-muted">
+              {{ t('harvester.storage.parameters.nodeSelector.no-options', null, true) }}
+            </span>
+          </template>
+        </LabeledSelect>
+      </div>
+      <div class="col span-6">
+        <LabeledSelect
+          v-model="diskSelector"
+          :label="t('harvester.storage.parameters.diskSelector.label')"
+          :options="diskTags"
+          :taggable="true"
+          :multiple="true"
+          :mode="mode"
+        >
+          <template #no-options="{ searching }">
+            <span v-if="!searching" class="text-muted">
+              {{ t('harvester.storage.parameters.diskSelector.no-options', null, true) }}
+            </span>
+          </template>
+        </LabeledSelect>
+      </div>
+    </div>
+    <div class="row mt-20">
+      <RadioGroup
+        v-model="value.parameters.migratable"
+        name="layer3NetworkMode"
+        :label="t('harvester.storage.parameters.migratable.label')"
+        :mode="mode"
+        :options="migratableOptions"
+      />
+    </div>
+    <div class="row mt-20">
+      <RadioGroup
+        v-model="volumeEncryption"
+        name="volumeEncryption"
+        :label="t('harvester.storage.volumeEncryption')"
+        :mode="mode"
+        :options="volumeEncryptionOptions"
+      />
+    </div>
+    <div v-if="value.parameters.encrypted === 'true'" class="row mt-20">
+      <div class="col span-6">
+        <LabeledSelect
+          v-model="secret"
+          :label="t('harvester.storage.secret')"
+          :options="secretOptions"
+          :mode="mode"
+        />
+      </div>
+    </div>
+    <KeyValue
+      v-model="parameters"
+      :add-label="t('storageClass.longhorn.addLabel')"
+      :read-allowed="false"
+      :mode="mode"
+      class="mt-10"
+    />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.labeled-input.compact-input {
+  padding: 7px 10px;
+}
+</style>
diff --git a/pkg/harvester/edit/harvesterhci.io.storage/provisioners/driver.longhorn.io_v2.vue b/pkg/harvester/edit/harvesterhci.io.storage/provisioners/driver.longhorn.io_v2.vue
new file mode 100644
index 00000000000..f495998198d
--- /dev/null
+++ b/pkg/harvester/edit/harvesterhci.io.storage/provisioners/driver.longhorn.io_v2.vue
@@ -0,0 +1,352 @@
+<script>
+import KeyValue from '@shell/components/form/KeyValue';
+import LabeledSelect from '@shell/components/form/LabeledSelect';
+import { LabeledInput } from '@components/Form/LabeledInput';
+import RadioGroup from '@components/Form/Radio/RadioGroup';
+import { SECRET, LONGHORN } from '@shell/config/types';
+import { _CREATE, _VIEW } from '@shell/config/query-params';
+import { CSI_SECRETS } from '@pkg/harvester/config/harvester-map';
+import { clone } from '@shell/utils/object';
+import { uniq } from '@shell/utils/array';
+import { DATA_ENGINE_V2 } from '../../../models/harvester/persistentvolumeclaim';
+
+// UI components for Longhorn storage class parameters
+const DEFAULT_PARAMETERS = [
+  'numberOfReplicas',
+  'staleReplicaTimeout',
+  'diskSelector',
+  'nodeSelector',
+  'migratable',
+  'encrypted',
+  'dataEngine',
+];
+
+const {
+  CSI_PROVISIONER_SECRET_NAME,
+  CSI_PROVISIONER_SECRET_NAMESPACE,
+  CSI_NODE_PUBLISH_SECRET_NAME,
+  CSI_NODE_PUBLISH_SECRET_NAMESPACE,
+  CSI_NODE_STAGE_SECRET_NAME,
+  CSI_NODE_STAGE_SECRET_NAMESPACE
+} = CSI_SECRETS;
+
+export default {
+  name: 'DriverLonghornIOV2',
+
+  components: {
+    KeyValue,
+    LabeledSelect,
+    LabeledInput,
+    RadioGroup,
+  },
+
+  props: {
+    value: {
+      type:     Object,
+      required: true
+    },
+    mode: {
+      type:     String,
+      required: true
+    },
+    realMode: {
+      type:     String,
+      required: true
+    },
+  },
+
+  data() {
+    if (this.realMode === _CREATE) {
+      this.$set(this.value, 'parameters', {
+        numberOfReplicas:    '3',
+        staleReplicaTimeout: '30',
+        diskSelector:        null,
+        nodeSelector:        null,
+        encrypted:           'false',
+        migratable:          'false',
+        dataEngine:          DATA_ENGINE_V2
+      });
+    }
+
+    return { };
+  },
+
+  computed: {
+    secrets() {
+      const inStore = this.$store.getters['currentProduct'].inStore;
+
+      const allSecrets = this.$store.getters[`${ inStore }/all`](SECRET);
+
+      // only show non-system secret to user to select
+      return allSecrets.filter(secret => secret.isSystem === false);
+    },
+
+    longhornNodes() {
+      const inStore = this.$store.getters['currentProduct'].inStore;
+
+      return this.$store.getters[`${ inStore }/all`](LONGHORN.NODES);
+    },
+
+    nodeTags() {
+      return (this.longhornNodes || []).reduce((sum, node) => {
+        const tags = node.spec?.tags || [];
+
+        return uniq([...sum, ...tags]);
+      }, []);
+    },
+
+    diskTags() {
+      return (this.longhornNodes || []).reduce((sum, node) => {
+        const disks = node.spec?.disks;
+
+        const tagsOfNode = Object.keys(disks).reduce((sum, key) => {
+          const tags = disks[key]?.tags || [];
+
+          return uniq([...sum, ...tags]);
+        }, []);
+
+        return uniq([...sum, ...tagsOfNode]);
+      }, []);
+    },
+
+    isView() {
+      return this.mode === _VIEW;
+    },
+
+    migratableOptions() {
+      return [{
+        label: this.t('generic.yes'),
+        value: 'true'
+      }, {
+        label: this.t('generic.no'),
+        value: 'false'
+      }];
+    },
+
+    secretOptions() {
+      return this.secrets.map(secret => secret.id);
+    },
+
+    volumeEncryptionOptions() {
+      return [{
+        label: this.t('generic.yes'),
+        value: 'true'
+      }, {
+        label: this.t('generic.no'),
+        value: 'false'
+      }];
+    },
+
+    parameters: {
+      get() {
+        const parameters = clone(this.value?.parameters) || {};
+
+        DEFAULT_PARAMETERS.forEach((key) => {
+          delete parameters[key];
+        });
+
+        Object.values(CSI_SECRETS).forEach((key) => {
+          delete parameters[key];
+        });
+
+        return parameters;
+      },
+
+      set(value) {
+        Object.assign(this.value.parameters, value);
+      }
+    },
+
+    volumeEncryption: {
+      set(neu) {
+        this.$set(this.value, 'parameters', {
+          ...this.value.parameters,
+          encrypted: neu
+        });
+      },
+
+      get() {
+        return this.value?.parameters?.encrypted || 'false';
+      }
+    },
+
+    secret: {
+      get() {
+        const selectedNs = this.value.parameters[CSI_PROVISIONER_SECRET_NAMESPACE];
+        const selectedName = this.value.parameters[CSI_PROVISIONER_SECRET_NAME];
+
+        if (selectedNs && selectedName) {
+          return `${ selectedNs }/${ selectedName }`;
+        }
+
+        return '';
+      },
+
+      set(selectedSecret) {
+        const [namespace, name] = selectedSecret.split('/');
+
+        this.$set(this.value, 'parameters', {
+          ...this.value.parameters,
+          [CSI_PROVISIONER_SECRET_NAME]:       name,
+          [CSI_NODE_PUBLISH_SECRET_NAME]:      name,
+          [CSI_NODE_STAGE_SECRET_NAME]:        name,
+          [CSI_PROVISIONER_SECRET_NAMESPACE]:  namespace,
+          [CSI_NODE_PUBLISH_SECRET_NAMESPACE]: namespace,
+          [CSI_NODE_STAGE_SECRET_NAMESPACE]:   namespace
+        });
+      }
+    },
+
+    nodeSelector: {
+      get() {
+        const nodeSelector = this.value?.parameters?.nodeSelector;
+
+        if ((nodeSelector || '').includes(',')) {
+          return nodeSelector.split(',');
+        } else if (nodeSelector) {
+          return [nodeSelector];
+        } else {
+          return [];
+        }
+      },
+
+      set(value) {
+        this.value.parameters.nodeSelector = (value || []).join(',');
+      }
+    },
+
+    diskSelector: {
+      get() {
+        const diskSelector = this.value?.parameters?.diskSelector;
+
+        if ((diskSelector || '').includes(',')) {
+          return diskSelector.split(',');
+        } else if (diskSelector) {
+          return [diskSelector];
+        } else {
+          return [];
+        }
+      },
+
+      set(value) {
+        this.value.parameters.diskSelector = (value || []).join(',');
+      }
+    },
+
+    numberOfReplicas: {
+      get() {
+        return this.value?.parameters?.numberOfReplicas;
+      },
+
+      set(value) {
+        if (value >= 1 && value <= 3) {
+          this.value.parameters.numberOfReplicas = String(value);
+        }
+      }
+    },
+  },
+};
+</script>
+<template>
+  <div>
+    <div class="row">
+      <div class="col span-6">
+        <LabeledInput
+          v-model="numberOfReplicas"
+          :label="t('harvester.storage.parameters.numberOfReplicas.label')"
+          :required="true"
+          :mode="mode"
+          min="1"
+          max="3"
+          type="number"
+        />
+      </div>
+      <div class="col span-6">
+        <LabeledInput
+          v-model="value.parameters.staleReplicaTimeout"
+          :label="t('harvester.storage.parameters.staleReplicaTimeout.label')"
+          :required="true"
+          :mode="mode"
+          type="number"
+        />
+      </div>
+    </div>
+    <div class="row mt-10">
+      <div class="col span-6">
+        <LabeledSelect
+          v-model="nodeSelector"
+          :label="t('harvester.storage.parameters.nodeSelector.label')"
+          :options="nodeTags"
+          :taggable="true"
+          :multiple="true"
+          :mode="mode"
+        >
+          <template #no-options="{ searching }">
+            <span v-if="!searching" class="text-muted">
+              {{ t('harvester.storage.parameters.nodeSelector.no-options', null, true) }}
+            </span>
+          </template>
+        </LabeledSelect>
+      </div>
+      <div class="col span-6">
+        <LabeledSelect
+          v-model="diskSelector"
+          :label="t('harvester.storage.parameters.diskSelector.label')"
+          :options="diskTags"
+          :taggable="true"
+          :multiple="true"
+          :mode="mode"
+        >
+          <template #no-options="{ searching }">
+            <span v-if="!searching" class="text-muted">
+              {{ t('harvester.storage.parameters.diskSelector.no-options', null, true) }}
+            </span>
+          </template>
+        </LabeledSelect>
+      </div>
+    </div>
+    <div class="row mt-20">
+      <RadioGroup
+        v-model="value.parameters.migratable"
+        name="layer3NetworkMode"
+        :label="t('harvester.storage.parameters.migratable.label')"
+        :mode="mode"
+        :options="migratableOptions"
+        :disabled="true"
+      />
+    </div>
+    <div class="row mt-20">
+      <RadioGroup
+        v-model="volumeEncryption"
+        name="volumeEncryption"
+        :label="t('harvester.storage.volumeEncryption')"
+        :mode="mode"
+        :options="volumeEncryptionOptions"
+        :disabled="true"
+      />
+    </div>
+    <div v-if="value.parameters.encrypted === 'true'" class="row mt-20">
+      <div class="col span-6">
+        <LabeledSelect
+          v-model="secret"
+          :label="t('harvester.storage.secret')"
+          :options="secretOptions"
+          :mode="mode"
+        />
+      </div>
+    </div>
+    <KeyValue
+      v-model="parameters"
+      :add-label="t('storageClass.longhorn.addLabel')"
+      :read-allowed="false"
+      :mode="mode"
+      class="mt-10"
+    />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.labeled-input.compact-input {
+  padding: 7px 10px;
+}
+</style>
diff --git a/pkg/harvester/edit/harvesterhci.io.storage/provisioners/lvm.driver.harvesterhci.io.vue b/pkg/harvester/edit/harvesterhci.io.storage/provisioners/lvm.driver.harvesterhci.io.vue
new file mode 100644
index 00000000000..dd714bca8e1
--- /dev/null
+++ b/pkg/harvester/edit/harvesterhci.io.storage/provisioners/lvm.driver.harvesterhci.io.vue
@@ -0,0 +1,169 @@
+<script>
+
+import KeyValue from '@shell/components/form/KeyValue';
+import LabeledSelect from '@shell/components/form/LabeledSelect';
+
+import { allHash } from '@shell/utils/promise';
+import { clone } from '@shell/utils/object';
+import { HCI } from '../../../types';
+import { NODE } from '@shell/config/types';
+import { LVM_TOPOLOGY_LABEL } from '../index.vue';
+
+const DEFAULT_PARAMETERS = [
+  'type',
+  'vgName'
+];
+
+const DEFAULT_TOPOLOGIES = [{
+  matchLabelExpressions: [{
+    key:    LVM_TOPOLOGY_LABEL,
+    values: []
+  }]
+}];
+
+export default {
+  components: {
+    KeyValue,
+    LabeledSelect,
+  },
+
+  props: {
+    value: {
+      type:     Object,
+      required: true
+    },
+    mode: {
+      type:     String,
+      required: true
+    },
+    realMode: {
+      type:     String,
+      required: true
+    },
+  },
+
+  async fetch() {
+    const inStore = this.$store.getters['currentProduct'].inStore;
+
+    await allHash({
+      nodes:           this.$store.dispatch(`${ inStore }/findAll`, { type: NODE }),
+      lvmVolumeGroups: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.LVM_VOLUME_GROUP }),
+    });
+  },
+
+  data() {
+    const node = (this.value.allowedTopologies?.[0]?.matchLabelExpressions || []).find(t => t.key === LVM_TOPOLOGY_LABEL)?.values[0];
+
+    return {
+      volumeGroupTypes: ['striped', 'dm-thin'],
+      node,
+    };
+  },
+
+  watch: {
+    node(value) {
+      delete (this.value.parameters.vgName);
+
+      const allowedTopologies = [...DEFAULT_TOPOLOGIES];
+
+      allowedTopologies[0].matchLabelExpressions[0].values = [value];
+
+      this.value.allowedTopologies = allowedTopologies;
+    }
+  },
+
+  computed: {
+    nodes() {
+      const inStore = this.$store.getters['currentProduct'].inStore;
+      const nodes = this.$store.getters[`${ inStore }/all`](NODE) || [];
+
+      return nodes.filter(n => n.labels[LVM_TOPOLOGY_LABEL] === n.name).map(n => n.name);
+    },
+
+    volumeGroups() {
+      const inStore = this.$store.getters['currentProduct'].inStore;
+      const lvmVolumeGroups = this.$store.getters[`${ inStore }/all`](HCI.LVM_VOLUME_GROUP) || [];
+
+      return lvmVolumeGroups
+        .filter(group => group.spec.nodeName === this.node)
+        .map(g => g.spec.vgName);
+    },
+
+    parameters: {
+      get() {
+        const parameters = clone(this.value?.parameters) || {};
+
+        DEFAULT_PARAMETERS.map((key) => {
+          delete parameters[key];
+        });
+
+        return parameters;
+      },
+
+      set(value) {
+        Object.assign(this.value.parameters, value);
+      }
+    },
+  },
+};
+</script>
+<template>
+  <div>
+    <div class="row mt-10">
+      <div class="col span-6">
+        <LabeledSelect
+          v-model="node"
+          :label="t('harvester.storage.parameters.node.label')"
+          :options="nodes"
+          :mode="mode"
+          :required="true"
+        >
+          <template #no-options="{ searching }">
+            <span v-if="!searching" class="text-muted">
+              {{ t('harvester.storage.parameters.diskSelector.no-options', null, true) }}
+            </span>
+          </template>
+        </LabeledSelect>
+      </div>
+    </div>
+    <div class="row mt-10">
+      <div class="col span-6">
+        <LabeledSelect
+          v-model="value.parameters.vgName"
+          :label="t('harvester.storage.parameters.lvmVolumeGroup.label')"
+          :options="volumeGroups"
+          :mode="mode"
+          :required="true"
+        >
+          <template #no-options="{ searching }">
+            <span v-if="!searching" class="text-muted">
+              {{ t('harvester.storage.parameters.lvmVolumeGroup.no-options', null, true) }}
+            </span>
+          </template>
+        </LabeledSelect>
+      </div>
+      <div class="col span-6">
+        <LabeledSelect
+          v-model="value.parameters.type"
+          :label="t('harvester.storage.parameters.lvmVolumeGroupType.label')"
+          :options="volumeGroupTypes"
+          :mode="mode"
+          :required="true"
+        />
+      </div>
+    </div>
+    <KeyValue
+      v-model="parameters"
+      :add-label="t('storageClass.longhorn.addLabel')"
+      :read-allowed="false"
+      :mode="mode"
+      class="mt-10"
+    />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.labeled-input.compact-input {
+  padding: 7px 10px;
+}
+</style>
diff --git a/pkg/harvester/edit/harvesterhci.io.virtualmachinebackup.vue b/pkg/harvester/edit/harvesterhci.io.virtualmachinebackup.vue
index 05b4c1b3139..d73a5f62bc6 100644
--- a/pkg/harvester/edit/harvesterhci.io.virtualmachinebackup.vue
+++ b/pkg/harvester/edit/harvesterhci.io.virtualmachinebackup.vue
@@ -159,6 +159,13 @@ export default {
   },
 
   methods: {
+<<<<<<< HEAD
+=======
+    cancelAction() {
+      this.$router.go(-1);
+    },
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     async saveRestore(buttonCb) {
       this.update();
 
@@ -261,7 +268,11 @@ export default {
       />
     </div>
 
+<<<<<<< HEAD
     <Footer mode="create" class="footer" :errors="errors" @save="saveRestore" @done="done" />
+=======
+    <Footer mode="create" class="footer" :errors="errors" @save="saveRestore" @done="cancelAction" />
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   </div>
 </template>
 
diff --git a/pkg/harvester/edit/harvesterhci.io.virtualmachineimage.vue b/pkg/harvester/edit/harvesterhci.io.virtualmachineimage.vue
index 23f28082c12..7572e748961 100644
--- a/pkg/harvester/edit/harvesterhci.io.virtualmachineimage.vue
+++ b/pkg/harvester/edit/harvesterhci.io.virtualmachineimage.vue
@@ -8,7 +8,10 @@ import NameNsDescription from '@shell/components/form/NameNsDescription';
 import { RadioGroup } from '@components/Form/Radio';
 import Select from '@shell/components/form/Select';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
+<<<<<<< HEAD
 
+=======
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 import CreateEditView from '@shell/mixins/create-edit-view';
 import { OS } from '../mixins/harvester-vm';
 import { VM_IMAGE_FILE_FORMAT } from '../validators/vm-image';
@@ -17,7 +20,15 @@ import { exceptionToErrorsArray } from '@shell/utils/error';
 import { allHash } from '@shell/utils/promise';
 import { STORAGE_CLASS } from '@shell/config/types';
 import { HCI } from '../types';
+<<<<<<< HEAD
 
+=======
+import { LVM_DRIVER } from '../models/harvester/storage.k8s.io.storageclass';
+
+const ENCRYPT = 'encrypt';
+const DECRYPT = 'decrypt';
+const CLONE = 'clone';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 const DOWNLOAD = 'download';
 const UPLOAD = 'upload';
 const rawORqcow2 = 'raw_qcow2';
@@ -57,11 +68,41 @@ export default {
     const defaultStorage = this.$store.getters[`${ inStore }/all`](STORAGE_CLASS).find(s => s.isDefault);
 
     this.$set(this, 'storageClassName', this.storageClassName || defaultStorage?.metadata?.name || 'longhorn');
+<<<<<<< HEAD
   },
 
   data() {
     if ( !this.value.spec ) {
       this.$set(this.value, 'spec', { sourceType: DOWNLOAD });
+=======
+    this.images = this.$store.getters[`${ inStore }/all`](HCI.IMAGE);
+
+    const { securityParameters } = this.value.spec;
+
+    // edit and view mode should show the source image
+    if (securityParameters) {
+      // image ns/name = image.id
+      const sourceImage = `${ securityParameters.sourceImageNamespace }/${ securityParameters.sourceImageName }`;
+
+      this.selectedImage = this.images.find(image => image.id === sourceImage);
+    }
+  },
+
+  data() {
+    // pass from Encrypt Image / Decrypt Image actions
+    const { image, sourceType, cryptoOperation } = this.$route.query || {};
+
+    if ( !this.value.spec ) {
+      this.$set(this.value, 'spec', { sourceType: sourceType || DOWNLOAD });
+    }
+
+    if (image && cryptoOperation) {
+      this.$set(this.value.spec, 'securityParameters', {
+        cryptoOperation,
+        sourceImageName:      image.metadata.name,
+        sourceImageNamespace: image.metadata.namespace
+      });
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     }
 
     if (!this.value.metadata.name) {
@@ -69,12 +110,23 @@ export default {
     }
 
     return {
+<<<<<<< HEAD
       url:      this.value.spec.url,
       files:    [],
       resource: '',
       headers:  {},
       fileUrl:  '',
       file:     '',
+=======
+      selectedImage: image || null,
+      images:        [],
+      url:           this.value.spec.url,
+      files:         [],
+      resource:      '',
+      headers:       {},
+      fileUrl:       '',
+      file:          '',
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     };
   },
 
@@ -92,13 +144,27 @@ export default {
     },
 
     showEditAsYaml() {
+<<<<<<< HEAD
       return this.value.spec.sourceType === DOWNLOAD;
     },
 
+=======
+      return this.value.spec.sourceType === DOWNLOAD || this.value.spec.sourceType === CLONE;
+    },
+    radioGroupOptions() {
+      return [
+        DOWNLOAD,
+        UPLOAD,
+        ENCRYPT,
+        DECRYPT
+      ];
+    },
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     storageClassOptions() {
       const inStore = this.$store.getters['currentProduct'].inStore;
       const storages = this.$store.getters[`${ inStore }/all`](STORAGE_CLASS);
 
+<<<<<<< HEAD
       const out = storages.filter(s => !s.parameters?.backingImage).map((s) => {
         const label = s.isDefault ? `${ s.name } (${ this.t('generic.default') })` : s.name;
 
@@ -109,6 +175,18 @@ export default {
       }) || [];
 
       return out;
+=======
+      return storages
+        .filter(s => !s.parameters?.backingImage && s.provisioner !== LVM_DRIVER) // Lvm storage is not supported.
+        .map((s) => {
+          const label = s.isDefault ? `${ s.name } (${ this.t('generic.default') })` : s.name;
+
+          return {
+            label,
+            value: s.name,
+          };
+        }) || [];
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     },
 
     storageClassName: {
@@ -120,6 +198,62 @@ export default {
         this.value.metadata.annotations[HCI_ANNOTATIONS.STORAGE_CLASS] = nue;
       }
     },
+<<<<<<< HEAD
+=======
+    sourceImageOptions() {
+      let options = [];
+
+      if (this.value.spec.sourceType !== CLONE) {
+        return options;
+      }
+      if (this.value.spec.securityParameters.cryptoOperation === ENCRYPT) {
+        options = this.images.filter(image => !image.isEncrypted);
+      } else {
+        options = this.images.filter(image => image.isEncrypted);
+      }
+
+      return options.map(image => image.displayNameWithNamespace);
+    },
+    sourceImage: {
+      get() {
+        if (this.selectedImage) {
+          return this.selectedImage.displayNameWithNamespace;
+        }
+
+        return '';
+      },
+      set(neu) {
+        this.selectedImage = this.images.find(i => i.displayNameWithNamespace === neu);
+        // sourceImageName should bring the name of the image
+        this.value.spec.securityParameters.sourceImageName = this.selectedImage?.metadata.name || '';
+        this.value.spec.securityParameters.sourceImageNamespace = this.selectedImage?.metadata.namespace || '';
+      }
+    },
+    sourceType: {
+      get() {
+        if (this.value.spec.sourceType === CLONE) {
+          return this.value.spec?.securityParameters?.cryptoOperation;
+        } else {
+          return this.value.spec.sourceType;
+        }
+      },
+
+      set(neu) {
+        if (neu === DECRYPT || neu === ENCRYPT) {
+          this.value.spec.sourceType = CLONE;
+          this.$set(this.value.spec, 'securityParameters', {
+            cryptoOperation:      neu,
+            sourceImageName:      '',
+            sourceImageNamespace: this.value.metadata.namespace
+          });
+          this.selectedImage = null;
+        } else {
+          this.$delete(this.value.spec, 'securityParameters');
+          this.value.spec.sourceType = neu;
+        }
+      }
+    }
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   },
 
   watch: {
@@ -297,6 +431,7 @@ export default {
       >
         <RadioGroup
           v-if="isCreate"
+<<<<<<< HEAD
           v-model="value.spec.sourceType"
           name="model"
           :options="[
@@ -306,6 +441,16 @@ export default {
           :labels="[
             t('harvester.image.sourceType.download'),
             t('harvester.image.sourceType.upload'),
+=======
+          v-model="sourceType"
+          name="model"
+          :options="radioGroupOptions"
+          :labels="[
+            t('harvester.image.sourceType.download'),
+            t('harvester.image.sourceType.upload'),
+            t('harvester.image.sourceType.encrypt'),
+            t('harvester.image.sourceType.decrypt'),
+>>>>>>> b5455bcb (fix: separate used/allocated units)
           ]"
           :mode="mode"
         />
@@ -331,7 +476,11 @@ export default {
               :tooltip="t('harvester.image.urlTip', {}, true)"
             />
 
+<<<<<<< HEAD
             <div v-else>
+=======
+            <div v-else-if="value.spec.sourceType === 'upload'">
+>>>>>>> b5455bcb (fix: separate used/allocated units)
               <LabeledInput
                 v-if="isView"
                 v-model="imageName"
@@ -376,6 +525,19 @@ export default {
               label-key="harvester.image.checksum"
               :tooltip="t('harvester.image.checksumTip')"
             />
+<<<<<<< HEAD
+=======
+
+            <LabeledSelect
+              v-if="value.spec.sourceType === 'clone'"
+              v-model="sourceImage"
+              :options="sourceImageOptions"
+              :label="t('harvester.image.sourceImage')"
+              :mode="mode"
+              :disabled="isEdit"
+              class="mb-20"
+            />
+>>>>>>> b5455bcb (fix: separate used/allocated units)
           </div>
         </div>
       </Tab>
@@ -412,6 +574,7 @@ export default {
           @focusKey="focusKey"
           @input="value.setLabels($event)"
         >
+<<<<<<< HEAD
           <template #key="{ row, keyName, queueUpdate}">
             <input
               ref="key"
@@ -421,10 +584,16 @@ export default {
             />
           </template>
 
+=======
+>>>>>>> b5455bcb (fix: separate used/allocated units)
           <template #value="{row, keyName, valueName, queueUpdate}">
             <Select
               v-if="internalAnnotations(row)"
               v-model="row[valueName]"
+<<<<<<< HEAD
+=======
+              :mode="mode"
+>>>>>>> b5455bcb (fix: separate used/allocated units)
               :searchable="true"
               :clearable="false"
               :options="calculateOptions(row[keyName])"
diff --git a/pkg/harvester/edit/harvesterhci.io.virtualmachinetemplateversion.vue b/pkg/harvester/edit/harvesterhci.io.virtualmachinetemplateversion.vue
index c5b7e897231..6c01d5f0ffc 100644
--- a/pkg/harvester/edit/harvesterhci.io.virtualmachinetemplateversion.vue
+++ b/pkg/harvester/edit/harvesterhci.io.virtualmachinetemplateversion.vue
@@ -21,7 +21,10 @@ import SSHKey from './kubevirt.io.virtualmachine/VirtualMachineSSHKey';
 
 import { HCI } from '../types';
 import { randomStr } from '@shell/utils/string';
+<<<<<<< HEAD
 import { RunStrategys } from '../config/harvester-map';
+=======
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 import { _CONFIG, _EDIT, _VIEW } from '@shell/config/query-params';
 import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
 
@@ -76,7 +79,10 @@ export default {
       description:      '',
       defaultVersion:   null,
       isDefaultVersion: false,
+<<<<<<< HEAD
       RunStrategys,
+=======
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     };
   },
 
@@ -264,7 +270,11 @@ export default {
       <Tab
         name="nodeScheduling"
         :label="t('workload.container.titles.nodeScheduling')"
+<<<<<<< HEAD
         :weight="-89"
+=======
+        :weight="-3"
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       >
         <template #default="{active}">
           <NodeScheduling
@@ -276,7 +286,11 @@ export default {
         </template>
       </Tab>
 
+<<<<<<< HEAD
       <Tab :label="t('harvester.tab.vmScheduling')" name="vmScheduling" :weight="-90">
+=======
+      <Tab :label="t('harvester.tab.vmScheduling')" name="vmScheduling" :weight="-4">
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         <template #default="{active}">
           <PodAffinity
             :key="active"
@@ -290,13 +304,49 @@ export default {
         </template>
       </Tab>
 
+<<<<<<< HEAD
+=======
+      <Tab
+        :name="t('generic.labels')"
+        :label="t('harvester.tab.instanceLabel')"
+        :weight="-5"
+      >
+        <Labels
+          :default-container-class="'labels-and-annotations-container'"
+          :value="value"
+          :mode="mode"
+          :display-side-by-side="false"
+          :show-annotations="false"
+          :show-label-title="false"
+        >
+          <template #labels="{toggler}">
+            <KeyValue
+              key="labels"
+              :value="value.instanceLabels"
+              :protected-keys="value.systemLabels || []"
+              :toggle-filter="toggler"
+              :add-label="t('labels.addLabel')"
+              :mode="mode"
+              :read-allowed="false"
+              :value-can-be-empty="true"
+              @input="value.setInstanceLabels($event)"
+            />
+          </template>
+        </Labels>
+      </Tab>
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       <Tab name="advanced" :label="t('harvester.tab.advanced')" :weight="-99">
         <div class="row mb-20">
           <div class="col span-6">
             <LabeledSelect
               v-model="runStrategy"
               label-key="harvester.virtualMachine.runStrategy"
+<<<<<<< HEAD
               :options="RunStrategys"
+=======
+              :options="runStrategies"
+>>>>>>> b5455bcb (fix: separate used/allocated units)
               :mode="mode"
             />
           </div>
@@ -312,6 +362,27 @@ export default {
         </div>
 
         <div class="row mb-20">
+<<<<<<< HEAD
+=======
+          <div class="col span-6">
+            <LabeledSelect
+              v-model="maintenanceStrategy"
+              label-key="harvester.virtualMachine.maintenanceStrategy.label"
+              :options="maintenanceStrategies"
+              :get-option-label="getMaintenanceStrategyOptionLabel"
+              :mode="mode"
+            />
+          </div>
+          <div class="col span-6">
+            <Reserved
+              :reserved-memory="reservedMemory"
+              :mode="mode"
+              @updateReserved="updateReserved"
+            />
+          </div>
+        </div>
+        <div class="row mb-20">
+>>>>>>> b5455bcb (fix: separate used/allocated units)
           <a v-if="showAdvanced" v-t="'harvester.generic.showMore'" role="button" @click="toggleAdvanced" />
           <a v-else v-t="'harvester.generic.showMore'" role="button" @click="toggleAdvanced" />
         </div>
@@ -319,6 +390,7 @@ export default {
         <div v-if="showAdvanced">
           <div class="row mb-20">
             <div class="col span-6">
+<<<<<<< HEAD
               <Reserved
                 :reserved-memory="reservedMemory"
                 :mode="mode"
@@ -326,6 +398,8 @@ export default {
               />
             </div>
             <div class="col span-6">
+=======
+>>>>>>> b5455bcb (fix: separate used/allocated units)
               <UnitInput
                 v-model="terminationGracePeriodSeconds"
                 :suffix="terminationGracePeriodSeconds == 1 ? 'Second' : 'Seconds'"
@@ -349,6 +423,17 @@ export default {
 
         <div class="spacer"></div>
         <Checkbox
+<<<<<<< HEAD
+=======
+          v-model="cpuPinning"
+          class="check"
+          type="checkbox"
+          tooltip-key="harvester.virtualMachine.cpuPinning.tooltip"
+          label-key="harvester.virtualMachine.cpuPinning.label"
+          :mode="mode"
+        />
+        <Checkbox
+>>>>>>> b5455bcb (fix: separate used/allocated units)
           v-model="installUSBTablet"
           class="check"
           type="checkbox"
@@ -389,6 +474,7 @@ export default {
           :mode="mode"
         />
       </Tab>
+<<<<<<< HEAD
 
       <Tab
         :name="t('generic.labels')"
@@ -418,6 +504,8 @@ export default {
           </template>
         </Labels>
       </Tab>
+=======
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     </Tabbed>
   </CruResource>
 </template>
diff --git a/pkg/harvester/edit/harvesterhci.io.vmsnapshot.vue b/pkg/harvester/edit/harvesterhci.io.vmsnapshot.vue
index 60f40ce50a9..0798d3833ce 100644
--- a/pkg/harvester/edit/harvesterhci.io.vmsnapshot.vue
+++ b/pkg/harvester/edit/harvesterhci.io.vmsnapshot.vue
@@ -157,6 +157,12 @@ export default {
   },
 
   methods: {
+<<<<<<< HEAD
+=======
+    cancelAction() {
+      this.$router.go(-1);
+    },
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     async saveRestore(buttonCb) {
       this.update();
 
@@ -241,7 +247,11 @@ export default {
       <LabeledSelect v-if="!restoreNewVm" v-model="deletionPolicy" :label="t('harvester.backup.restore.deletePreviousVolumes')" :options="deletionPolicyOption" />
     </div>
 
+<<<<<<< HEAD
     <Footer mode="create" class="footer" :errors="errors" @save="saveRestore" @done="done" />
+=======
+    <Footer mode="create" class="footer" :errors="errors" @save="saveRestore" @done="cancelAction" />
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   </div>
 </template>
 
diff --git a/pkg/harvester/edit/harvesterhci.io.volume.vue b/pkg/harvester/edit/harvesterhci.io.volume.vue
index 5c8c41967ee..f5d89251128 100644
--- a/pkg/harvester/edit/harvesterhci.io.volume.vue
+++ b/pkg/harvester/edit/harvesterhci.io.volume.vue
@@ -7,7 +7,11 @@ import ResourceTabs from '@shell/components/form/ResourceTabs';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 import { LabeledInput } from '@components/Form/LabeledInput';
 import NameNsDescription from '@shell/components/form/NameNsDescription';
+<<<<<<< HEAD
 
+=======
+import { Banner } from '@components/Banner';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 import { allHash } from '@shell/utils/promise';
 import { get } from '@shell/utils/object';
 import { HCI, VOLUME_SNAPSHOT } from '../types';
@@ -15,15 +19,28 @@ import { STORAGE_CLASS, LONGHORN, PV } from '@shell/config/types';
 import { sortBy } from '@shell/utils/sort';
 import { saferDump } from '@shell/utils/create-yaml';
 import { InterfaceOption, VOLUME_DATA_SOURCE_KIND } from '../config/harvester-map';
+<<<<<<< HEAD
 import { _CREATE } from '@shell/config/query-params';
 import CreateEditView from '@shell/mixins/create-edit-view';
 import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
 import { STATE, NAME, AGE, NAMESPACE } from '@shell/config/table-headers';
+=======
+import { _CREATE, _EDIT } from '@shell/config/query-params';
+import CreateEditView from '@shell/mixins/create-edit-view';
+import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
+import { STATE, NAME, AGE, NAMESPACE } from '@shell/config/table-headers';
+import { LVM_DRIVER } from '../models/harvester/storage.k8s.io.storageclass';
+import { DATA_ENGINE_V2 } from '../models/harvester/persistentvolumeclaim';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 export default {
   name: 'HarvesterVolume',
 
   components: {
+<<<<<<< HEAD
+=======
+    Banner,
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     Tab,
     UnitInput,
     CruResource,
@@ -56,6 +73,10 @@ export default {
     const hash = await allHash(_hash);
 
     this.snapshots = hash.snapshots;
+<<<<<<< HEAD
+=======
+    this.images = hash.images;
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
     const defaultStorage = this.$store.getters[`harvester/all`](STORAGE_CLASS).find( O => O.isDefault);
 
@@ -77,6 +98,10 @@ export default {
       storage,
       imageId,
       snapshots: [],
+<<<<<<< HEAD
+=======
+      images:    [],
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     };
   },
 
@@ -89,6 +114,13 @@ export default {
       return this.source === 'blank';
     },
 
+<<<<<<< HEAD
+=======
+    isEdit() {
+      return this.mode === _EDIT;
+    },
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     isVMImage() {
       return this.source === 'url';
     },
@@ -108,10 +140,15 @@ export default {
     },
 
     imageOption() {
+<<<<<<< HEAD
       const choices = this.$store.getters['harvester/all'](HCI.IMAGE);
 
       return sortBy(
         choices
+=======
+      return sortBy(
+        this.images
+>>>>>>> b5455bcb (fix: separate used/allocated units)
           .filter(obj => obj.isReady)
           .map((obj) => {
             return {
@@ -156,11 +193,22 @@ export default {
       return VOLUME_DATA_SOURCE_KIND[this.value.spec?.dataSource?.kind];
     },
 
+<<<<<<< HEAD
     storageClassOptions() {
       const inStore = this.$store.getters['currentProduct'].inStore;
       const storages = this.$store.getters[`${ inStore }/all`](STORAGE_CLASS);
 
       const out = storages.filter(s => !s.parameters?.backingImage).map((s) => {
+=======
+    storageClasses() {
+      const inStore = this.$store.getters['currentProduct'].inStore;
+
+      return this.$store.getters[`${ inStore }/all`](STORAGE_CLASS);
+    },
+
+    storageClassOptions() {
+      return this.storageClasses.filter(s => !s.parameters?.backingImage).map((s) => {
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         const label = s.isDefault ? `${ s.name } (${ this.t('generic.default') })` : s.name;
 
         return {
@@ -168,8 +216,11 @@ export default {
           value: s.name,
         };
       }) || [];
+<<<<<<< HEAD
 
       return out;
+=======
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     },
 
     frontend() {
@@ -220,6 +271,21 @@ export default {
   },
 
   methods: {
+<<<<<<< HEAD
+=======
+    getAccessMode() {
+      const storageClassName = this.value.spec.storageClassName;
+      const storageClass = this.storageClasses.find(sc => sc.name === storageClassName);
+
+      let readWriteOnce = this.value.isLvm || this.value.isLonghornV2;
+
+      if (storageClass) {
+        readWriteOnce = storageClass.provisioner === LVM_DRIVER || storageClass.parameters?.dataEngine === DATA_ENGINE_V2;
+      }
+
+      return readWriteOnce ? ['ReadWriteOnce'] : ['ReadWriteMany'];
+    },
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     willSave() {
       this.update();
     },
@@ -241,15 +307,35 @@ export default {
 
       const spec = {
         ...this.value.spec,
+<<<<<<< HEAD
         resources: { requests: { storage: this.storage } },
         storageClassName
+=======
+        resources:   { requests: { storage: this.storage } },
+        storageClassName,
+        accessModes: this.getAccessMode(),
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       };
 
       this.value.setAnnotations(imageAnnotations);
 
       this.$set(this.value, 'spec', spec);
     },
+<<<<<<< HEAD
 
+=======
+    updateImage() {
+      if (this.isVMImage && this.imageId) {
+        const imageResource = this.images?.find(image => this.imageId === image.id);
+        const imageSize = Math.max(imageResource?.status?.size, imageResource?.status?.virtualSize);
+
+        if (imageSize) {
+          this.storage = `${ Math.ceil(imageSize / 1024 / 1024 / 1024) }Gi`;
+        }
+      }
+      this.update();
+    },
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     generateYaml() {
       const out = saferDump(this.value);
 
@@ -300,7 +386,11 @@ export default {
           required
           :mode="mode"
           class="mb-20"
+<<<<<<< HEAD
           @input="update"
+=======
+          @input="updateImage"
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         />
 
         <LabeledSelect
@@ -322,10 +412,21 @@ export default {
           :output-modifier="true"
           :increment="1024"
           :mode="mode"
+<<<<<<< HEAD
+=======
+          :disabled="value?.isLonghornV2 && isEdit"
+>>>>>>> b5455bcb (fix: separate used/allocated units)
           required
           class="mb-20"
           @input="update"
         />
+<<<<<<< HEAD
+=======
+
+        <Banner v-if="value?.isLonghornV2 && isEdit" color="warning">
+          <span>{{ t('harvester.volume.longhorn.disableResize') }}</span>
+        </Banner>
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       </Tab>
       <Tab v-if="!isCreate" name="details" :label="t('harvester.volume.tabs.details')" :weight="2.5" class="bordered-table">
         <LabeledInput v-model="frontendDisplay" class="mb-20" :mode="mode" :disabled="true" :label="t('harvester.volume.frontend')" />
diff --git a/pkg/harvester/edit/kubevirt.io.virtualmachine/CompatibilityMatrix.vue b/pkg/harvester/edit/kubevirt.io.virtualmachine/CompatibilityMatrix.vue
new file mode 100644
index 00000000000..97c74657d30
--- /dev/null
+++ b/pkg/harvester/edit/kubevirt.io.virtualmachine/CompatibilityMatrix.vue
@@ -0,0 +1,157 @@
+<script>
+import { mapGetters } from 'vuex';
+export default {
+  props: {
+    /**
+     * deviceId/vendorId is unique per type of device - there may be multiple CRD objects for a given device
+     * {
+     *  [deviceId/vendorId]: {
+     *      nodes: array of devicecrd.status.nodeName's for given device,
+     *      deviceCRDs: array of all instances of given device
+     *      }
+     * }
+     */
+    enabledDevices: {
+      type:     Array,
+      required: true
+    },
+    /**
+ * {
+ *  [node name]: [devices]
+ * }
+ */
+    devicesByNode: {
+      type:     Object,
+      required: true
+    },
+
+    /**
+ * {
+ *  [deviceCRD.status.resourceName]: {
+ *      count: number of this device in use by other vms
+ *      usedBy: [names of all vms using this device]
+ *    }
+ * }
+ */
+
+    devicesInUse: {
+      type:    Object,
+      default: () => {}
+    }
+  },
+
+  computed: {
+    ...mapGetters({ t: 'i18n/t' }),
+    allNodeNames() {
+      return Object.keys(this.devicesByNode);
+    },
+
+    allDeviceIds() {
+      return Object.keys(this.uniqueDevices);
+    }
+  },
+
+  methods: {
+    nodeNameFromId(id) {
+      return this.devicesByNode[id]?.name;
+    },
+
+    nodeHasDevice(nodeName, deviceCRD) {
+      return deviceCRD.status.nodeName === nodeName;
+    },
+
+    noneAvailable(deviceCRD) {
+      const name = deviceCRD.metadata?.name;
+
+      return !!this.devicesInUse[name];
+    },
+
+    deviceTooltip(deviceCRD) {
+      return `${ deviceCRD?.status?.resourceName }<br/>${ deviceCRD?.status?.description }`;
+    }
+  }
+};
+</script>
+
+<template>
+  <div class="compat-matrix">
+    <div class="device-col node-names">
+      <div class="blank-corner">
+        <div class="text-right">
+          {{ t('harvester.devices.matrixDeviceClaimName') }}
+        </div>
+        <div>{{ t('harvester.devices.matrixHostName') }}</div>
+      </div>
+      <div v-for="nodeName in allNodeNames" :key="nodeName" class="node-label">
+        <span>  {{ nodeName }}</span>
+      </div>
+    </div>
+    <div v-for="deviceCRD in enabledDevices" :key="deviceCRD.metadata.name" class="device-col">
+      <div v-clean-tooltip="deviceTooltip(deviceCRD)" class="compat-cell device-label" :class="{'text-muted': noneAvailable(deviceCRD)}">
+        {{ deviceCRD.metadata.name }}
+      </div>
+      <div
+        v-for="nodeName in allNodeNames"
+        :key="nodeName"
+        class="compat-cell"
+        :class="{'has-device': nodeHasDevice(nodeName, deviceCRD)}"
+      />
+    </div>
+  </div>
+</template>
+
+<style lang='scss'>
+.compat-matrix {
+    display: flex;
+}
+
+.device-col {
+    display: flex;
+    flex-direction: column;
+
+    border-right: 1px solid var(--border);
+
+    &>*{
+        border-bottom: 1px solid var(--border);
+    }
+}
+
+.compat-cell {
+    flex-basis: 1em;
+    padding: 0px 10px 0px 10px;
+
+    &.has-device {
+        background-color: var(--info-banner-bg);
+    }
+}
+
+.node-label, .device-label {
+    display: flex;
+    align-items: center;
+    color: var(--input-label);
+}
+
+.node-label{
+    padding: 0 10px;
+    justify-content: center;
+}
+
+.node-label, .device-label, .compat-cell, .blank-corner {
+    flex-basis: calc(2em + 10px);
+}
+
+.blank-corner {
+  background: linear-gradient(
+              to top right,
+              #fff 0%,
+              #fff calc(50% - 1px),
+                var(--body-text) 50%,
+              #fff calc(50% + 1px),
+              #fff 100%
+           );
+
+  DIV.text-right {
+    padding-left: 80px;
+  }
+}
+</style>
diff --git a/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineCloudConfig/index.vue b/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineCloudConfig/index.vue
index 9f6838ccecd..c4a5713148b 100644
--- a/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineCloudConfig/index.vue
+++ b/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineCloudConfig/index.vue
@@ -11,7 +11,10 @@ import { _VIEW } from '@shell/config/query-params';
 import DataTemplate from './DataTemplate';
 
 const _NEW = '_NEW';
+<<<<<<< HEAD
 const _NONE = '_NONE';
+=======
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 export default {
   components: {
@@ -82,21 +85,27 @@ export default {
       value: _NEW,
     });
 
+<<<<<<< HEAD
     optionUser.unshift({
       label: this.t('harvester.virtualMachine.cloudConfig.cloudInit.placeholder'),
       value: _NONE,
     });
 
+=======
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     optionNetwork.unshift({
       label: this.t('harvester.virtualMachine.cloudConfig.createNew'),
       value: _NEW,
     });
 
+<<<<<<< HEAD
     optionNetwork.unshift({
       label: this.t('harvester.virtualMachine.cloudConfig.cloudInit.placeholder'),
       value: _NONE,
     });
 
+=======
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     this.optionUser = optionUser;
     this.optionNetwork = optionNetwork;
   },
diff --git a/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachinePciDevices/DeviceList.vue b/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachinePciDevices/DeviceList.vue
index 24c437d5925..0ba128995ee 100644
--- a/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachinePciDevices/DeviceList.vue
+++ b/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachinePciDevices/DeviceList.vue
@@ -78,7 +78,10 @@ export default {
         label: 'Claimed By',
         value: 'passthroughClaim.userName',
         sort:  ['passthroughClaim.userName'],
+<<<<<<< HEAD
 
+=======
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       });
     }
 
diff --git a/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachinePciDevices/index.vue b/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachinePciDevices/index.vue
index 814e3f19d9a..5058fa502af 100644
--- a/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachinePciDevices/index.vue
+++ b/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachinePciDevices/index.vue
@@ -4,11 +4,19 @@ import { allHash } from '@shell/utils/promise';
 import { HCI } from '../../../types';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 import Banner from '@components/Banner/Banner.vue';
+<<<<<<< HEAD
 import CompatibilityMatrix from './CompatibilityMatrix';
 import DeviceList from './DeviceList';
 
 import remove from 'lodash/remove';
 import { get, set } from '@shell/utils/object';
+=======
+import CompatibilityMatrix from '../CompatibilityMatrix';
+import DeviceList from './DeviceList';
+
+import remove from 'lodash/remove';
+import { set } from '@shell/utils/object';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 export default {
   name:       'VirtualMachinePCIDevices',
@@ -53,10 +61,20 @@ export default {
     const selectedDevices = [];
     const oldFormatDevices = [];
 
+<<<<<<< HEAD
     (this.value?.domain?.devices?.hostDevices || []).forEach(({ name, deviceName }) => {
       const checkName = (deviceName || '').split('/')?.[1];
 
       if (checkName && name.includes(checkName)) {
+=======
+    const vmDevices = this.value?.domain?.devices?.hostDevices || [];
+    const otherDevices = this.otherDevices(vmDevices).map(({ name }) => name);
+
+    vmDevices.forEach(({ name, deviceName }) => {
+      const checkName = (deviceName || '').split('/')?.[1];
+
+      if (checkName && name.includes(checkName) && !otherDevices.includes(name)) {
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         oldFormatDevices.push(name);
       } else if (this.enabledDevices.find(device => device?.metadata?.name === name)) {
         selectedDevices.push(name);
@@ -94,7 +112,16 @@ export default {
         };
       });
 
+<<<<<<< HEAD
       set(this.value.domain.devices, 'hostDevices', formatted);
+=======
+      const devices = [
+        ...this.otherDevices(this.value.domain.devices.hostDevices || []),
+        ...formatted,
+      ];
+
+      set(this.value.domain.devices, 'hostDevices', devices);
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     }
   },
 
@@ -113,9 +140,14 @@ export default {
         if (vm.metadata.name === this.vm?.metadata?.name) {
           return inUse;
         }
+<<<<<<< HEAD
         const devices = get(vm, 'spec.template.spec.domain.devices.hostDevices') || [];
 
         devices.forEach((device) => {
+=======
+
+        vm.hostDevices.forEach((device) => {
+>>>>>>> b5455bcb (fix: separate used/allocated units)
           inUse[device.name] = { usedBy: [vm.metadata.name] };
         });
 
@@ -126,6 +158,7 @@ export default {
     },
 
     devicesByNode() {
+<<<<<<< HEAD
       const out = {};
 
       this.enabledDevices.forEach((deviceCRD) => {
@@ -139,6 +172,21 @@ export default {
       });
 
       return out;
+=======
+      return this.enabledDevices?.reduce((acc, device) => {
+        const nodeName = device.status?.nodeName;
+
+        if (nodeName) {
+          if (!acc[nodeName]) {
+            acc[nodeName] = [];
+          } else {
+            acc[nodeName].push(device);
+          }
+        }
+
+        return acc;
+      }, {});
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     },
 
     // determine which nodes contain all devices selected
@@ -185,6 +233,13 @@ export default {
   },
 
   methods: {
+<<<<<<< HEAD
+=======
+    otherDevices(vmDevices) {
+      return vmDevices.filter(device => !this.pciDevices.find(pci => device.name === pci.name));
+    },
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     nodeNameFromUid(uid) {
       for (const deviceUid in this.uniqueDevices) {
         const nodes = this.uniqueDevices[deviceUid].nodes;
diff --git a/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineSSHKey.vue b/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineSSHKey.vue
index 6ffd2497924..838a94d8780 100644
--- a/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineSSHKey.vue
+++ b/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineSSHKey.vue
@@ -109,6 +109,7 @@ export default {
 
   watch: {
     publicKey(neu) {
+<<<<<<< HEAD
       const splitSSH = neu.split(/\s+/);
 
       if (splitSSH.length === 3) {
@@ -119,6 +120,16 @@ export default {
             }
           }
         }
+=======
+      const trimNeu = neu.trim();
+      const splitSSH = trimNeu.split(/\s+/);
+
+      if (splitSSH.length === 3 && !this.sshName) {
+        const keyComment = splitSSH[2];
+
+        this.randomStr = randomStr(10).toLowerCase();
+        this.sshName = keyComment.includes('@') ? keyComment.split('@')[0] : keyComment;
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       }
     },
 
diff --git a/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineUSBDevices/DeviceList.vue b/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineUSBDevices/DeviceList.vue
new file mode 100644
index 00000000000..e1bd50f8c40
--- /dev/null
+++ b/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineUSBDevices/DeviceList.vue
@@ -0,0 +1,160 @@
+<script>
+import ResourceTable from '@shell/components/ResourceTable';
+import { HCI } from '../../../types';
+import { STATE, SIMPLE_NAME } from '@shell/config/table-headers';
+import { defaultTableSortGenerationFn } from '@shell/components/ResourceTable.vue';
+
+export default {
+  name: 'ListUsbDevices',
+
+  components: { ResourceTable },
+
+  props: {
+    schema: {
+      type:     Object,
+      required: true,
+    },
+
+    devices: {
+      type:     Array,
+      required: true,
+    },
+  },
+
+  async fetch() {
+    const inStore = this.$store.getters['currentProduct'].inStore;
+
+    await this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.USB_CLAIM });
+  },
+
+  data() {
+    const isSingleProduct = this.$store.getters['isSingleProduct'];
+
+    // TODO add new column
+    const headers = [
+      { ...STATE },
+      SIMPLE_NAME,
+      {
+        name:     'description',
+        labelKey: 'tableHeaders.description',
+        value:    'status.description',
+        sort:     ['status.description']
+      },
+      {
+        name:     'node',
+        labelKey: 'tableHeaders.node',
+        value:    'status.nodeName',
+        sort:     ['status.nodeName']
+      },
+      {
+        name:  'pciAddress',
+        label: 'Address',
+        value: 'status.pciAddress',
+        sort:  ['status.pciAddress']
+      },
+      {
+        name:  'vendorID',
+        label: 'Vendor ID',
+        value: 'status.vendorID',
+        sort:  ['status.vendorID', 'status.productID']
+      },
+      {
+        name:  'productID',
+        label: 'Product ID',
+        value: 'status.productID',
+        sort:  ['status.productID', 'status.vendorID']
+      },
+    ];
+
+    if (!isSingleProduct) {
+      headers.push( {
+        name:  'claimed',
+        label: 'Claimed By',
+        value: 'claimedBy',
+        sort:  ['claimedBy'],
+      });
+    }
+
+    return {
+      headers,
+      rows:       [],
+      filterRows: []
+    };
+  },
+
+  watch: {
+    devices: {
+      handler(v) {
+        this.rows = v;
+        this.filterRows = this.rows;
+      },
+      immediate: true,
+    },
+  },
+
+  methods: {
+    enableGroup(rows = []) {
+      const row = rows[0];
+
+      if (row) {
+        row.enablePassthroughBulk(rows);
+      }
+    },
+    disableGroup(rows = []) {
+      rows.forEach((row) => {
+        if (row.passthroughClaim) {
+          row.disablePassthrough();
+        }
+      });
+    },
+    groupIsAllEnabled(rows = []) {
+      return !rows.find(device => !device.passthroughClaim);
+    },
+
+    changeRows(filterRows) {
+      this.$set(this, 'filterRows', filterRows);
+    },
+
+    sortGenerationFn() {
+      let base = defaultTableSortGenerationFn(this.schema, this.$store);
+
+      if (this.parentSriov) {
+        base += this.parentSriov;
+      }
+
+      return base;
+    },
+  },
+
+  typeDisplay() {
+    return this.t('harvester.usb.label');
+  }
+};
+</script>
+
+<template>
+  <ResourceTable
+    :headers="headers"
+    :schema="schema"
+    :rows="filterRows"
+    :use-query-params-for-simple-filtering="true"
+    :sort-generation-fn="sortGenerationFn"
+    :rows-per-page="10"
+  >
+    <template #group-by="{group}">
+      <div :ref="group.key" v-trim-whitespace class="group-tab">
+        <button v-if="groupIsAllEnabled(group.rows)" type="button" class="btn btn-sm role-secondary mr-5" @click="e=>{disableGroup(group.rows); e.target.blur()}">
+          {{ t('harvester.usb.disableGroup') }}
+        </button>
+        <button v-else type="button" class="btn btn-sm role-secondary mr-5" @click="e=>{enableGroup(group.rows); e.target.blur()}">
+          {{ t('harvester.usb.enableGroup') }}
+        </button>
+        <span v-clean-html="group.key" />
+      </div>
+    </template>
+    <template #cell:claimed="{row}">
+      <span v-if="row.status.enabled">{{ row.claimedBy }}</span>
+      <span v-else class="text-muted">&mdash;</span>
+    </template>
+  </ResourceTable>
+</template>
diff --git a/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineUSBDevices/index.vue b/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineUSBDevices/index.vue
new file mode 100644
index 00000000000..91ce2c3241c
--- /dev/null
+++ b/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineUSBDevices/index.vue
@@ -0,0 +1,228 @@
+<script>
+import { _EDIT } from '@shell/config/query-params';
+import { allHash } from '@shell/utils/promise';
+import { HCI } from '../../../types';
+import { STATE, SIMPLE_NAME } from '@shell/config/table-headers';
+import LabeledSelect from '@shell/components/form/LabeledSelect';
+import Banner from '@components/Banner/Banner.vue';
+import CompatibilityMatrix from '../CompatibilityMatrix';
+import DeviceList from './DeviceList';
+
+import remove from 'lodash/remove';
+import { set } from '@shell/utils/object';
+
+export default {
+  name:       'VirtualMachineUSBDevices',
+  components: {
+    Banner,
+    CompatibilityMatrix,
+    DeviceList,
+    LabeledSelect,
+  },
+  props: {
+    mode: {
+      type:    String,
+      default: _EDIT
+    },
+
+    value: {
+      type:    Object,
+      default: () => {}
+    },
+
+    vm: {
+      type:    Object,
+      default: () => {}
+    }
+  },
+
+  async fetch() {
+    const hash = {
+      devices: this.$store.dispatch('harvester/findAll', { type: HCI.USB_DEVICE }),
+      vms:     this.$store.dispatch(`harvester/findAll`, { type: HCI.VM })
+    };
+
+    const res = await allHash(hash);
+
+    for (const key in res) {
+      this[key] = res[key];
+    }
+
+    this.selectedDevices = (this.value?.domain?.devices?.hostDevices || [])
+      .map(({ name }) => name)
+      .filter(name => this.enabledDevices.find(device => device?.metadata?.name === name));
+  },
+
+  data() {
+    return {
+      deviceSchema:  this.$store.getters['harvester/schemaFor'](HCI.USB_DEVICE),
+      deviceHeaders: [
+        { ...STATE },
+        SIMPLE_NAME,
+      ],
+      devices:         [],
+      vms:             [],
+      selectedDevices: [],
+      showMatrix:      false,
+    };
+  },
+
+  watch: {
+    selectedDevices(neu) {
+      const formatted = neu.map((selectedDevice) => {
+        const deviceCRD = this.enabledDevices.find(device => device.metadata.name === selectedDevice);
+        const deviceName = deviceCRD?.status?.resourceName;
+
+        return {
+          deviceName,
+          name: deviceCRD?.metadata.name,
+        };
+      });
+
+      const devices = [
+        ...this.otherDevices(this.value.domain.devices.hostDevices || []),
+        ...formatted,
+      ];
+
+      set(this.value.domain.devices, 'hostDevices', devices);
+    }
+  },
+
+  computed: {
+    deviceOpts() {
+      const filteredOptions = this.enabledDevices.filter((deviceCRD) => {
+        if (this.selectedDevices.length > 0) {
+          const selectedDevice = this.enabledDevices.find(device => device.metadata.name === this.selectedDevices[0]);
+
+          return !this.devicesInUse[deviceCRD?.metadata.name] && deviceCRD.status.nodeName === selectedDevice?.status.nodeName;
+        }
+
+        return !this.devicesInUse[deviceCRD?.metadata.name];
+      });
+
+      return filteredOptions.map((deviceCRD) => {
+        return {
+          value:        deviceCRD?.metadata.name,
+          label:        deviceCRD?.metadata.name,
+          displayLabel: deviceCRD?.status?.description,
+        };
+      });
+    },
+
+    enabledDevices() {
+      return this.devices.filter((device) => {
+        return device.status.enabled;
+      });
+    },
+
+    devicesInUse() {
+      const inUse = this.vms.reduce((inUse, vm) => {
+        if (vm.metadata.name === this.vm?.metadata?.name) {
+          return inUse;
+        }
+
+        vm.hostDevices.forEach((device) => {
+          inUse[device.name] = { usedBy: [vm.metadata.name] };
+        });
+
+        return inUse;
+      }, {});
+
+      return inUse;
+    },
+
+    devicesByNode() {
+      return this.enabledDevices?.reduce((acc, device) => {
+        const nodeName = device.status?.nodeName;
+
+        if (nodeName) {
+          if (!acc[nodeName]) {
+            acc[nodeName] = [];
+          } else {
+            acc[nodeName].push(device);
+          }
+        }
+
+        return acc;
+      }, {});
+    },
+
+    compatibleNodes() {
+      const out = [...Object.keys(this.devicesByNode)];
+
+      this.selectedDevices.forEach((deviceUid) => {
+        remove(out, (nodeName) => {
+          const device = this.enabledDevices.find(deviceCRD => deviceCRD.metadata.name === deviceUid);
+
+          return device?.status.nodeName !== nodeName;
+        });
+      });
+
+      return out;
+    },
+  },
+
+  methods: {
+    otherDevices(vmDevices) {
+      return vmDevices.filter(device => !this.devices.find(usb => device.name === usb.name));
+    }
+  }
+};
+</script>
+
+<template>
+  <div>
+    <div class="row">
+      <div class="col span-12">
+        <Banner color="info">
+          <t k="harvester.usb.howToUseDevice" />
+        </Banner>
+        <Banner v-if="selectedDevices.length > 0" color="info">
+          <t k="harvester.usb.deviceInTheSameHost" />
+        </Banner>
+      </div>
+    </div>
+    <template v-if="enabledDevices.length">
+      <div class="row">
+        <div class="col span-6">
+          <LabeledSelect
+            v-model="selectedDevices"
+            :label="t('harvester.usb.available')"
+            searchable
+            multiple
+            taggable
+            :options="deviceOpts"
+            :mode="mode"
+          >
+            <template #option="option">
+              <span>{{ option.value }} <span class="text-label">({{ option.displayLabel }})</span></span>
+            </template>
+          </LabeledSelect>
+        </div>
+      </div>
+      <div v-if="compatibleNodes.length && selectedDevices.length" class="row">
+        <div class="col span-12 text-muted">
+          Compatible hosts:
+          <!-- eslint-disable-next-line vue/no-parsing-error -->
+          <span v-for="(node, idx) in compatibleNodes" :key="node">{{ node }}{{ idx < compatibleNodes.length-1 ? ', ' : '' }}</span>
+        </div>
+      </div>
+      <div v-else-if="selectedDevices.length" class="text-error">
+        {{ t('harvester.usb.impossibleSelection') }}
+      </div>
+      <button type="button" class="btn btn-sm role-link pl-0" @click="e=>{showMatrix = !showMatrix; e.target.blur()}">
+        {{ showMatrix ? t('harvester.usb.hideCompatibility') : t('harvester.usb.showCompatibility') }}
+      </button>
+      <div v-if="showMatrix" class="row mt-20">
+        <div class="col span-12">
+          <CompatibilityMatrix :enabled-devices="enabledDevices" :devices-by-node="devicesByNode" :devices-in-use="devicesInUse" />
+        </div>
+      </div>
+    </template>
+    <div class="row mt-20">
+      <div class="col span-12">
+        <DeviceList :schema="deviceSchema" :devices="devices" @submit.prevent />
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVGpuDevices/index.vue b/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVGpuDevices/index.vue
index 5aecce2246e..48be70a5a92 100644
--- a/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVGpuDevices/index.vue
+++ b/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVGpuDevices/index.vue
@@ -11,7 +11,11 @@ import { set } from '@shell/utils/object';
 import { uniq } from '@shell/utils/array';
 
 export default {
+<<<<<<< HEAD
   name:       'VirtualMachinedevices',
+=======
+  name:       'VirtualMachineVGpuDevices',
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   components: {
     Banner,
     LabeledSelect,
@@ -105,6 +109,7 @@ export default {
     },
 
     devicesByNode() {
+<<<<<<< HEAD
       const out = {};
 
       this.enabledDevices.forEach((deviceCRD) => {
@@ -118,6 +123,21 @@ export default {
       });
 
       return out;
+=======
+      return this.enabledDevices?.reduce((acc, device) => {
+        const nodeName = device.spec?.nodeName;
+
+        if (nodeName) {
+          if (!acc[nodeName]) {
+            acc[nodeName] = [];
+          } else {
+            acc[nodeName].push(device);
+          }
+        }
+
+        return acc;
+      }, {});
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     },
 
     compatibleNodes() {
diff --git a/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/index.vue b/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/index.vue
index cd1fda59c35..bf8c9483ed3 100644
--- a/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/index.vue
+++ b/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/index.vue
@@ -8,11 +8,20 @@ import { LabeledInput } from '@components/Form/LabeledInput';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 import ModalWithCard from '@shell/components/ModalWithCard';
 
+<<<<<<< HEAD
 import { PVC, STORAGE_CLASS } from '@shell/config/types';
 import { HCI } from '../../../types';
 import { clone } from '@shell/utils/object';
 import { removeObject } from '@shell/utils/array';
 import { randomStr } from '@shell/utils/string';
+=======
+import { PVC } from '@shell/config/types';
+import { HCI } from '../../../types';
+import { clone } from '@shell/utils/object';
+import { ucFirst, randomStr } from '@shell/utils/string';
+import { removeObject } from '@shell/utils/array';
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 import { SOURCE_TYPE } from '../../../config/harvester-map';
 import { _VIEW, _EDIT, _CREATE } from '@shell/config/query-params';
 import { PRODUCT_NAME as HARVESTER_PRODUCT } from '../../../config/harvester';
@@ -80,6 +89,10 @@ export default {
 
   data() {
     return {
+<<<<<<< HEAD
+=======
+      ucFirst,
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       SOURCE_TYPE,
       rows:    clone(this.value),
       nameIdx: 1,
@@ -173,10 +186,14 @@ export default {
       };
 
       if (type === SOURCE_TYPE.NEW) {
+<<<<<<< HEAD
         const inStore = this.$store.getters['currentProduct'].inStore;
         const defaultStorage = this.$store.getters[`${ inStore }/all`](STORAGE_CLASS).find( O => O.isDefault);
 
         neu.storageClassName = defaultStorage?.metadata?.name || 'longhorn';
+=======
+        neu.storageClassName = this.defaultStorageClass?.metadata?.name || 'longhorn';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       }
 
       this.rows.push(neu);
@@ -223,13 +240,23 @@ export default {
       }
     },
 
+<<<<<<< HEAD
     headerFor(type) {
       return {
+=======
+    headerFor(type, hasVolBackups = false) {
+      const mainHeader = {
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         [SOURCE_TYPE.NEW]:           this.$store.getters['i18n/t']('harvester.virtualMachine.volume.title.volume'),
         [SOURCE_TYPE.IMAGE]:         this.$store.getters['i18n/t']('harvester.virtualMachine.volume.title.vmImage'),
         [SOURCE_TYPE.ATTACH_VOLUME]: this.$store.getters['i18n/t']('harvester.virtualMachine.volume.title.existingVolume'),
         [SOURCE_TYPE.CONTAINER]:     this.$store.getters['i18n/t']('harvester.virtualMachine.volume.title.container'),
       }[type];
+<<<<<<< HEAD
+=======
+
+      return hasVolBackups ? `${ mainHeader } and Backups` : mainHeader;
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     },
 
     update() {
@@ -254,6 +281,13 @@ export default {
 
     getImageDisplayName(id) {
       return this.$store.getters['harvester/all'](HCI.IMAGE).find(image => image.id === id)?.spec?.displayName;
+<<<<<<< HEAD
+=======
+    },
+
+    isLonghornV2(volume) {
+      return volume?.pvc?.isLonghornV2 || volume?.pvc?.storageClass?.isLonghornV2;
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     }
   },
 };
@@ -292,7 +326,11 @@ export default {
               </span>
 
               <span v-else>
+<<<<<<< HEAD
                 {{ headerFor(volume.source) }}
+=======
+                {{ headerFor(volume.source, !!volume?.volumeBackups) }}
+>>>>>>> b5455bcb (fix: separate used/allocated units)
               </span>
             </h3>
             <div>
@@ -328,7 +366,28 @@ export default {
               </div>
             </div>
 
+<<<<<<< HEAD
             <Banner v-if="volume.volumeStatus && !isCreate" class="mt-15 volume-status" color="warning" :label="volume.volumeStatus" />
+=======
+            <div class="mt-15">
+              <Banner
+                v-if="volume.volumeStatus && !isCreate"
+                class="volume-status"
+                color="warning"
+                :label="ucFirst(volume.volumeStatus)"
+              />
+              <Banner
+                v-if="value.volumeBackups && value.volumeBackups.error && value.volumeBackups.error.message"
+                color="error"
+                :label="ucFirst(value.volumeBackups.error.message)"
+              />
+              <Banner
+                v-if="isLonghornV2(volume) && !isView"
+                color="warning"
+                :label="t('harvester.volume.longhorn.disableResize')"
+              />
+            </div>
+>>>>>>> b5455bcb (fix: separate used/allocated units)
           </InfoBox>
         </div>
       </transition-group>
@@ -430,4 +489,11 @@ export default {
     justify-content: center;
     align-items: center;
   }
+<<<<<<< HEAD
+=======
+
+  .banner {
+    margin: 10px 0;
+  }
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 </style>
diff --git a/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/type/container.vue b/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/type/container.vue
index 4a992224ecc..5058e95d252 100644
--- a/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/type/container.vue
+++ b/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/type/container.vue
@@ -3,11 +3,19 @@ import { LabeledInput } from '@components/Form/LabeledInput';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 import InputOrDisplay from '@shell/components/InputOrDisplay';
 import { VOLUME_TYPE, InterfaceOption } from '../../../../config/harvester-map';
+<<<<<<< HEAD
+=======
+import { Banner } from '@components/Banner';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 export default {
   name:       'HarvesterEditContainer',
   components: {
+<<<<<<< HEAD
     LabeledInput, LabeledSelect, InputOrDisplay
+=======
+    LabeledInput, LabeledSelect, InputOrDisplay, Banner
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   },
 
   props: {
@@ -67,7 +75,10 @@ export default {
           />
         </InputOrDisplay>
       </div>
+<<<<<<< HEAD
 
+=======
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       <div
         data-testid="input-hec-type"
         class="col span-6"
@@ -108,10 +119,16 @@ export default {
           />
         </InputOrDisplay>
       </div>
+<<<<<<< HEAD
 
       <div
         data-testid="input-hec-bus"
         class="col span-3"
+=======
+      <div
+        data-testid="input-hec-bus"
+        class="col span-6"
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       >
         <InputOrDisplay
           :name="t('harvester.virtualMachine.volume.bus')"
@@ -128,5 +145,31 @@ export default {
         </InputOrDisplay>
       </div>
     </div>
+<<<<<<< HEAD
+=======
+    <div class="row mb-20">
+      <div
+        v-if="value.volumeBackups"
+        class="col span-6"
+      >
+        <InputOrDisplay
+          :name="t('harvester.virtualMachine.volume.readyToUse')"
+          :value="value.volumeBackups.readyToUse"
+          :mode="mode"
+        >
+          <LabelValue
+            :name="t('harvester.virtualMachine.volume.readyToUse')"
+            :value="value.volumeBackups.readyToUse"
+          />
+        </InputOrDisplay>
+      </div>
+    </div>
+    <Banner
+      v-if="value.volumeBackups && value.volumeBackups.error && value.volumeBackups.error.message"
+      color="error"
+      class="mb-20"
+      :label="value.volumeBackups.error.message"
+    />
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   </div>
 </template>
diff --git a/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/type/existing.vue b/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/type/existing.vue
index 935697d6546..d194691f586 100644
--- a/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/type/existing.vue
+++ b/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/type/existing.vue
@@ -1,9 +1,16 @@
 <script>
 import UnitInput from '@shell/components/form/UnitInput';
 import { LabeledInput } from '@components/Form/LabeledInput';
+<<<<<<< HEAD
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 import InputOrDisplay from '@shell/components/InputOrDisplay';
 
+=======
+import LabelValue from '@shell/components/LabelValue';
+import LabeledSelect from '@shell/components/form/LabeledSelect';
+import InputOrDisplay from '@shell/components/InputOrDisplay';
+import { Banner } from '@components/Banner';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 import { sortBy } from '@shell/utils/sort';
 import { PVC } from '@shell/config/types';
 import { HCI } from '../../../../types';
@@ -14,7 +21,11 @@ import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations
 export default {
   name:       'HarvesterEditExisting',
   components: {
+<<<<<<< HEAD
     UnitInput, LabeledInput, LabeledSelect, InputOrDisplay
+=======
+    UnitInput, LabeledInput, LabeledSelect, InputOrDisplay, LabelValue, Banner
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   },
 
   props: {
@@ -272,7 +283,10 @@ export default {
           />
         </InputOrDisplay>
       </div>
+<<<<<<< HEAD
 
+=======
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       <div
         data-testid="input-hee-bus"
         class="col span-6"
@@ -293,6 +307,31 @@ export default {
           />
         </InputOrDisplay>
       </div>
+<<<<<<< HEAD
+    </div>
+=======
+      <div
+        v-if="value.volumeBackups"
+        class="col span-6"
+      >
+        <InputOrDisplay
+          :name="t('harvester.virtualMachine.volume.readyToUse')"
+          :value="value.volumeBackups.readyToUse"
+          :mode="mode"
+        >
+          <LabelValue
+            :name="t('harvester.virtualMachine.volume.readyToUse')"
+            :value="value.volumeBackups.readyToUse"
+          />
+        </InputOrDisplay>
+      </div>
     </div>
+    <Banner
+      v-if="value.volumeBackups && value.volumeBackups.error && value.volumeBackups.error.message"
+      color="error"
+      class="mb-20"
+      :label="value.volumeBackups.error.message"
+    />
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   </div>
 </template>
diff --git a/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/type/vmImage.vue b/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/type/vmImage.vue
index 3f5f9e094a3..2279b2eb66c 100644
--- a/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/type/vmImage.vue
+++ b/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/type/vmImage.vue
@@ -2,18 +2,34 @@
 import { findBy } from '@shell/utils/array';
 import UnitInput from '@shell/components/form/UnitInput';
 import { LabeledInput } from '@components/Form/LabeledInput';
+<<<<<<< HEAD
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 import InputOrDisplay from '@shell/components/InputOrDisplay';
+=======
+import LabelValue from '@shell/components/LabelValue';
+import LabeledSelect from '@shell/components/form/LabeledSelect';
+import InputOrDisplay from '@shell/components/InputOrDisplay';
+import { Banner } from '@components/Banner';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 import { PVC } from '@shell/config/types';
 import { HCI } from '../../../../types';
 import { formatSi, parseSi } from '@shell/utils/units';
 import { VOLUME_TYPE, InterfaceOption } from '../../../../config/harvester-map';
+<<<<<<< HEAD
+=======
+import { _VIEW } from '@shell/config/query-params';
+import { ucFirst } from '@shell/utils/string';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 export default {
   name: 'HarvesterEditVMImage',
 
   components: {
+<<<<<<< HEAD
     UnitInput, LabeledInput, LabeledSelect, InputOrDisplay
+=======
+    UnitInput, LabeledInput, LabeledSelect, InputOrDisplay, LabelValue, Banner
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   },
 
   props: {
@@ -73,6 +89,17 @@ export default {
   },
 
   computed: {
+<<<<<<< HEAD
+=======
+    encryptionValue() {
+      return ucFirst(String(this.value.isEncrypted));
+    },
+
+    isView() {
+      return this.mode === _VIEW;
+    },
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     imagesOption() {
       return this.images.filter(c => c.isReady).sort((a, b) => a.creationTimestamp > b.creationTimestamp ? -1 : 1).map( (I) => {
         return {
@@ -88,12 +115,28 @@ export default {
       return image ? image.label : '-';
     },
 
+<<<<<<< HEAD
+=======
+    readyToUse() {
+      const val = String(this.value.volumeBackups?.readyToUse || false);
+
+      return ucFirst(val);
+    },
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     pvcsResource() {
       const allPVCs = this.$store.getters['harvester/all'](PVC) || [];
 
       return allPVCs.find((P) => {
         return this.namespace ? P.id === `${ this.namespace }/${ this.value.volumeName }` : true;
       });
+<<<<<<< HEAD
+=======
+    },
+
+    isLonghornV2() {
+      return this.value.pvc?.isLonghornV2 || this.value.pvc?.storageClass?.isLonghornV2;
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     }
   },
 
@@ -140,6 +183,7 @@ export default {
 
     onImageChange() {
       const imageResource = this.$store.getters['harvester/all'](HCI.IMAGE)?.find( I => this.value.image === I.id);
+<<<<<<< HEAD
 
       if (this.idx === 0) {
         if (/iso$/i.test(imageResource?.imageSuffix)) {
@@ -149,6 +193,26 @@ export default {
           this.$set(this.value, 'type', 'disk');
           this.$set(this.value, 'bus', 'virtio');
         }
+=======
+      const isIsoImage = /iso$/i.test(imageResource?.imageSuffix);
+      const imageSize = Math.max(imageResource?.status?.size, imageResource?.status?.virtualSize);
+
+      if (isIsoImage) {
+        this.$set(this.value, 'type', 'cd-rom');
+        this.$set(this.value, 'bus', 'sata');
+      } else {
+        this.$set(this.value, 'type', 'disk');
+        this.$set(this.value, 'bus', 'virtio');
+      }
+
+      if (imageSize) {
+        let imageSizeGiB = Math.ceil(imageSize / 1024 / 1024 / 1024);
+
+        if (!isIsoImage) {
+          imageSizeGiB = Math.max(imageSizeGiB, 10);
+        }
+        this.$set(this.value, 'size', `${ imageSizeGiB }Gi`);
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       }
 
       this.update();
@@ -251,6 +315,10 @@ export default {
             :label="t('harvester.fields.size')"
             :mode="mode"
             :required="validateRequired"
+<<<<<<< HEAD
+=======
+            :disable="isLonghornV2"
+>>>>>>> b5455bcb (fix: separate used/allocated units)
             suffix="GiB"
             @input="update"
           />
@@ -261,7 +329,11 @@ export default {
     <div class="row mb-20">
       <div
         data-testid="input-hevi-bus"
+<<<<<<< HEAD
         class="col span-3"
+=======
+        class="col span-6"
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       >
         <InputOrDisplay
           :name="t('harvester.virtualMachine.volume.bus')"
@@ -277,6 +349,33 @@ export default {
           />
         </InputOrDisplay>
       </div>
+<<<<<<< HEAD
+    </div>
+=======
+      <div
+        v-if="isView"
+        class="col span-3"
+      >
+        <LabelValue
+          :name="t('harvester.virtualMachine.volume.encryption')"
+          :value="encryptionValue"
+        />
+      </div>
+    </div>
+    <div class="row mb-20">
+      <div v-if="value.volumeBackups && isView" class="col span-3">
+        <LabelValue
+          :name="t('harvester.virtualMachine.volume.readyToUse')"
+          :value="readyToUse"
+        />
+      </div>
     </div>
+    <Banner
+      v-if="value.volumeBackups && value.volumeBackups.error && value.volumeBackups.error.message"
+      color="error"
+      class="mb-20"
+      :label="value.volumeBackups.error.message"
+    />
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   </div>
 </template>
diff --git a/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/type/volume.vue b/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/type/volume.vue
index 8cd29f05f15..c6bc4f1b658 100644
--- a/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/type/volume.vue
+++ b/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/type/volume.vue
@@ -4,15 +4,30 @@ import UnitInput from '@shell/components/form/UnitInput';
 import InputOrDisplay from '@shell/components/InputOrDisplay';
 import { LabeledInput } from '@components/Form/LabeledInput';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
+<<<<<<< HEAD
 
 import { PVC, STORAGE_CLASS } from '@shell/config/types';
 import { formatSi, parseSi } from '@shell/utils/units';
 import { VOLUME_TYPE, InterfaceOption } from '../../../../config/harvester-map';
+=======
+import { PVC, STORAGE_CLASS } from '@shell/config/types';
+import { formatSi, parseSi } from '@shell/utils/units';
+import { VOLUME_TYPE, InterfaceOption } from '../../../../config/harvester-map';
+import { _VIEW } from '@shell/config/query-params';
+import LabelValue from '@shell/components/LabelValue';
+import { ucFirst } from '@shell/utils/string';
+import { LVM_DRIVER } from '../../../../models/harvester/storage.k8s.io.storageclass';
+import { DATA_ENGINE_V2 } from '../../../../models/harvester/persistentvolumeclaim';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 export default {
   name:       'HarvesterEditVolume',
   components: {
+<<<<<<< HEAD
     InputOrDisplay, Loading, LabeledInput, LabeledSelect, UnitInput,
+=======
+    InputOrDisplay, Loading, LabeledInput, LabeledSelect, UnitInput, LabelValue
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   },
 
   props: {
@@ -58,6 +73,23 @@ export default {
   },
 
   computed: {
+<<<<<<< HEAD
+=======
+    encryptionValue() {
+      return ucFirst(String(this.value.isEncrypted));
+    },
+
+    readyToUse() {
+      const val = String(this.value.volumeBackups?.readyToUse || false);
+
+      return ucFirst(val);
+    },
+
+    isView() {
+      return this.mode === _VIEW;
+    },
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     pvcsResource() {
       const allPVCs = this.$store.getters['harvester/all'](PVC) || [];
 
@@ -68,10 +100,19 @@ export default {
       return !this.value.newCreateId && this.isEdit && this.isVirtualType;
     },
 
+<<<<<<< HEAD
     storageClassOptions() {
       const storages = this.$store.getters[`harvester/all`](STORAGE_CLASS) || [];
 
       const out = storages.filter(s => !s.parameters?.backingImage).map((s) => {
+=======
+    storageClasses() {
+      return this.$store.getters[`harvester/all`](STORAGE_CLASS) || [];
+    },
+
+    storageClassOptions() {
+      return this.storageClasses.filter(s => !s.parameters?.backingImage).map((s) => {
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         const label = s.isDefault ? `${ s.name } (${ this.t('generic.default') })` : s.name;
 
         return {
@@ -79,12 +120,30 @@ export default {
           value: s.name,
         };
       }) || [];
+<<<<<<< HEAD
 
       return out;
     },
   },
 
   watch: {
+=======
+    },
+
+    isLonghornV2() {
+      return this.value.pvc?.isLonghornV2 || this.value.pvc?.storageClass?.isLonghornV2;
+    }
+  },
+
+  watch: {
+    'value.storageClassName': {
+      immediate: true,
+      handler(neu) {
+        this.value.accessMode = this.getAccessMode(neu);
+      }
+    },
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     'value.type'(neu) {
       if (neu === 'cd-rom') {
         this.$set(this.value, 'bus', 'sata');
@@ -113,6 +172,21 @@ export default {
   },
 
   methods: {
+<<<<<<< HEAD
+=======
+    getAccessMode(storageClassName) {
+      const storageClass = this.storageClasses.find(sc => sc.name === storageClassName);
+
+      let readWriteOnce = this.value.pvc?.isLvm || this.value.pvc?.isLonghornV2;
+
+      if (storageClass) {
+        readWriteOnce = storageClass.provisioner === LVM_DRIVER || storageClass.parameters?.dataEngine === DATA_ENGINE_V2;
+      }
+
+      return readWriteOnce ? 'ReadWriteOnce' : 'ReadWriteMany';
+    },
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     update() {
       this.$emit('update');
     },
@@ -203,16 +277,27 @@ export default {
             :mode="mode"
             :required="validateRequired"
             :label="t('harvester.fields.size')"
+<<<<<<< HEAD
+=======
+            :disabled="isLonghornV2"
+>>>>>>> b5455bcb (fix: separate used/allocated units)
             @input="update"
           />
         </InputOrDisplay>
       </div>
     </div>
+<<<<<<< HEAD
 
     <div class="row mb-20">
       <div
         data-testid="input-hev-bus"
         class="col span-3"
+=======
+    <div class="row mb-20">
+      <div
+        data-testid="input-hev-bus"
+        class="col span-6"
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       >
         <InputOrDisplay :name="t('harvester.virtualMachine.volume.bus')" :value="value.bus" :mode="mode">
           <LabeledSelect
@@ -225,6 +310,26 @@ export default {
           />
         </InputOrDisplay>
       </div>
+<<<<<<< HEAD
+=======
+      <div
+        v-if="isView"
+        class="col span-6"
+      >
+        <LabelValue
+          :name="t('harvester.virtualMachine.volume.encryption')"
+          :value="encryptionValue"
+        />
+      </div>
+    </div>
+    <div class="row mb-20">
+      <div v-if="value.volumeBackups && isView" class="col span-3">
+        <LabelValue
+          :name="t('harvester.virtualMachine.volume.readyToUse')"
+          :value="readyToUse"
+        />
+      </div>
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     </div>
   </div>
 </template>
diff --git a/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue b/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue
index 6a356bb0877..fd9aa74bd91 100644
--- a/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue
+++ b/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue
@@ -1,7 +1,11 @@
 <script>
 import { isEqual } from 'lodash';
 import { mapGetters } from 'vuex';
+<<<<<<< HEAD
 
+=======
+import { Banner } from '@components/Banner';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 import Tabbed from '@shell/components/Tabbed';
 import Tab from '@shell/components/Tabbed/Tab';
 import { Checkbox } from '@components/Form/Checkbox';
@@ -12,7 +16,11 @@ import LabeledSelect from '@shell/components/form/LabeledSelect';
 import NameNsDescription from '@shell/components/form/NameNsDescription';
 import UnitInput from '@shell/components/form/UnitInput';
 import Labels from '@shell/components/form/Labels';
+<<<<<<< HEAD
 
+=======
+import MessageLink from '@shell/components/MessageLink';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 import Reserved from './VirtualMachineReserved';
 import SSHKey from './VirtualMachineSSHKey';
 import Volume from './VirtualMachineVolume';
@@ -23,14 +31,22 @@ import NodeScheduling from '@shell/components/form/NodeScheduling';
 import PodAffinity from '@shell/components/form/PodAffinity';
 import AccessCredentials from './VirtualMachineAccessCredentials';
 import PciDevices from './VirtualMachinePciDevices/index';
+<<<<<<< HEAD
 import VirtualMachineVGpuDevices from './VirtualMachineVGpuDevices/index';
+=======
+import VGpuDevices from './VirtualMachineVGpuDevices/index';
+import UsbDevices from './VirtualMachineUSBDevices/index';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 import RestartVMDialog from '../../dialog/RestartVMDialog';
 import KeyValue from '@shell/components/form/KeyValue';
 
 import { clear } from '@shell/utils/array';
 import { clone } from '@shell/utils/object';
 import { HCI } from '../../types';
+<<<<<<< HEAD
 import { RunStrategys } from '../../config/harvester-map';
+=======
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 import { saferDump } from '@shell/utils/create-yaml';
 import { exceptionToErrorsArray } from '@shell/utils/error';
 import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
@@ -66,8 +82,16 @@ export default {
     PciDevices,
     RestartVMDialog,
     UnitInput,
+<<<<<<< HEAD
     VirtualMachineVGpuDevices,
     KeyValue,
+=======
+    VGpuDevices,
+    KeyValue,
+    Banner,
+    MessageLink,
+    UsbDevices,
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   },
 
   mixins: [CreateEditView, VM_MIXIN],
@@ -95,14 +119,28 @@ export default {
       useTemplate:       false,
       hostname,
       isRestartImmediately,
+<<<<<<< HEAD
       RunStrategys,
       isOpen:            false,
+=======
+      // isOpen:            false,
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     };
   },
 
   computed: {
     ...mapGetters({ t: 'i18n/t' }),
 
+<<<<<<< HEAD
+=======
+    to() {
+      return {
+        name:   'harvester-c-cluster-resource',
+        params: { cluster: this.$store.getters['clusterId'], resource: HCI.HOST },
+      };
+    },
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     machineTypeOptions() {
       return [{
         label: 'None',
@@ -173,6 +211,29 @@ export default {
     hasStartAction() {
       return this.value.hasAction('start');
     },
+<<<<<<< HEAD
+=======
+
+    enableCpuPinningCheckbox() {
+      if (this.mode === 'create') {
+        return this.nodes.some(node => node.isCPUManagerEnabled); // any one of nodes has label cpuManager=true
+      }
+
+      return true;
+    },
+
+    showCpuPinningBanner() {
+      if (this.mode === 'edit') {
+        return this.cpuPinning !== !!this.cloneVM.spec.template.spec.domain.cpu.dedicatedCpuPlacement;
+      }
+
+      if (this.mode === 'create') {
+        return this.nodes.every(node => !node.isCPUManagerEnabled); // no node enabled CPU manager
+      }
+
+      return false;
+    }
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   },
 
   watch: {
@@ -578,24 +639,74 @@ export default {
       </Tab>
 
       <Tab v-if="enabledSriovgpu" :label="t('harvester.tab.vGpuDevices')" name="vGpuDevices" :weight="-6">
+<<<<<<< HEAD
         <VirtualMachineVGpuDevices :mode="mode" :value="spec.template.spec" :vm="value" />
       </Tab>
 
       <Tab v-if="isEdit" :label="t('harvester.tab.accessCredentials')" name="accessCredentials" :weight="-7">
+=======
+        <VGpuDevices :mode="mode" :value="spec.template.spec" :vm="value" />
+      </Tab>
+
+      <Tab v-if="enabledPCI" :label="t('harvester.tab.usbDevices')" name="usbDevices" :weight="-7">
+        <UsbDevices :mode="mode" :value="spec.template.spec" :vm="value" />
+      </Tab>
+
+      <Tab v-if="isEdit" :label="t('harvester.tab.accessCredentials')" name="accessCredentials" :weight="-8">
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         <AccessCredentials v-model="accessCredentials" :mode="mode" :resource="value" :is-qemu-installed="isQemuInstalled" />
       </Tab>
 
       <Tab
+<<<<<<< HEAD
         name="advanced"
         :label="t('harvester.tab.advanced')"
         :weight="-8"
+=======
+        name="instanceLabel"
+        :label="t('harvester.tab.instanceLabel')"
+        :weight="-8"
+      >
+        <Labels
+          :default-container-class="'labels-and-annotations-container'"
+          :value="value"
+          :mode="mode"
+          :display-side-by-side="false"
+          :show-annotations="false"
+          :show-label-title="false"
+        >
+          <template #labels="{toggler}">
+            <KeyValue
+              key="labels"
+              :value="value.instanceLabels"
+              :protected-keys="value.systemLabels || []"
+              :toggle-filter="toggler"
+              :add-label="t('labels.addLabel')"
+              :mode="mode"
+              :read-allowed="false"
+              :value-can-be-empty="true"
+              @input="value.setInstanceLabels($event)"
+            />
+          </template>
+        </Labels>
+      </Tab>
+
+      <Tab
+        name="advanced"
+        :label="t('harvester.tab.advanced')"
+        :weight="-9"
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       >
         <div class="row mb-20">
           <div class="col span-6">
             <LabeledSelect
               v-model="runStrategy"
               label-key="harvester.virtualMachine.runStrategy"
+<<<<<<< HEAD
               :options="RunStrategys"
+=======
+              :options="runStrategies"
+>>>>>>> b5455bcb (fix: separate used/allocated units)
               :mode="mode"
             />
           </div>
@@ -611,6 +722,28 @@ export default {
         </div>
 
         <div class="row mb-20">
+<<<<<<< HEAD
+=======
+          <div class="col span-6">
+            <LabeledSelect
+              v-model="maintenanceStrategy"
+              label-key="harvester.virtualMachine.maintenanceStrategy.label"
+              :options="maintenanceStrategies"
+              :get-option-label="getMaintenanceStrategyOptionLabel"
+              :mode="mode"
+            />
+          </div>
+          <div class="col span-6">
+            <Reserved
+              :reserved-memory="reservedMemory"
+              :mode="mode"
+              @updateReserved="updateReserved"
+            />
+          </div>
+        </div>
+
+        <div class="row mb-20">
+>>>>>>> b5455bcb (fix: separate used/allocated units)
           <a v-if="showAdvanced" v-t="'harvester.generic.showMore'" role="button" @click="toggleAdvanced" />
           <a v-else v-t="'harvester.generic.showMore'" role="button" @click="toggleAdvanced" />
         </div>
@@ -638,6 +771,7 @@ export default {
 
           <div class="row mb-20">
             <div class="col span-6">
+<<<<<<< HEAD
               <Reserved
                 :reserved-memory="reservedMemory"
                 :mode="mode"
@@ -645,6 +779,8 @@ export default {
               />
             </div>
             <div class="col span-6">
+=======
+>>>>>>> b5455bcb (fix: separate used/allocated units)
               <UnitInput
                 v-model="terminationGracePeriodSeconds"
                 :suffix="terminationGracePeriodSeconds == 1 ? 'Second' : 'Seconds'"
@@ -670,6 +806,19 @@ export default {
         />
 
         <Checkbox
+<<<<<<< HEAD
+=======
+          v-model="cpuPinning"
+          :disabled="!enableCpuPinningCheckbox"
+          class="check"
+          type="checkbox"
+          tooltip-key="harvester.virtualMachine.cpuPinning.tooltip"
+          label-key="harvester.virtualMachine.cpuPinning.label"
+          :mode="mode"
+        />
+
+        <Checkbox
+>>>>>>> b5455bcb (fix: separate used/allocated units)
           v-model="installUSBTablet"
           class="check mt-20"
           type="checkbox"
@@ -712,6 +861,7 @@ export default {
           :label="t('harvester.virtualMachine.secureBoot')"
           :mode="mode"
         />
+<<<<<<< HEAD
       </Tab>
 
       <Tab
@@ -741,6 +891,23 @@ export default {
             />
           </template>
         </Labels>
+=======
+        <Banner
+          v-if="showCpuPinningBanner"
+          color="warning"
+        >
+          <MessageLink
+            v-if="mode === 'create'"
+            :to="to"
+            prefix-label="harvester.virtualMachine.advancedOptions.cpuManager.prefix"
+            middle-label="harvester.virtualMachine.advancedOptions.cpuManager.middle"
+            suffix-label="harvester.virtualMachine.advancedOptions.cpuManager.suffix"
+          />
+          <span v-if="mode==='edit'">
+            {{ t('harvester.virtualMachine.cpuPinning.restartVMMessage') }}
+          </span>
+        </Banner>
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       </Tab>
     </Tabbed>
 
diff --git a/pkg/harvester/formatters/BackupCreatedFrom.vue b/pkg/harvester/formatters/BackupCreatedFrom.vue
new file mode 100644
index 00000000000..74a43bc698a
--- /dev/null
+++ b/pkg/harvester/formatters/BackupCreatedFrom.vue
@@ -0,0 +1,41 @@
+<script>
+import { HCI } from '../types';
+
+export default {
+  props: {
+    value: {
+      type:    String,
+      default: ''
+    },
+  },
+  data() {
+    const scheduleList = this.$store.getters['harvester/all'](HCI.SCHEDULE_VM_BACKUP) || [];
+
+    return { scheduleList };
+  },
+  computed: {
+    vmSchedule() {
+      if (!this.value) {
+        return '';
+      } else {
+        return this.scheduleList.find(s => s.id === this.value);
+      }
+    },
+    to() {
+      return this.vmSchedule?.detailLocation;
+    },
+  }
+};
+</script>
+
+<template>
+  <n-link v-if="to" :to="to">
+    {{ value }}
+  </n-link>
+  <span v-else-if="value">
+    {{ value }}
+  </span>
+  <span v-else class="text-muted">
+    &mdash;
+  </span>
+</template>
diff --git a/pkg/harvester/formatters/HarvesterCPUPinning.vue b/pkg/harvester/formatters/HarvesterCPUPinning.vue
new file mode 100644
index 00000000000..32b338a898d
--- /dev/null
+++ b/pkg/harvester/formatters/HarvesterCPUPinning.vue
@@ -0,0 +1,44 @@
+<script>
+
+export default {
+  name:  'HarvesterCPUPinningFormatter',
+  props: {
+    value: {
+      type:    String, // id
+      default: '',
+    },
+    rows: {
+      type:     Array,
+      required: true,
+    },
+  },
+  computed: {
+    row() {
+      return this.rows.find(r => r.id === this.value);
+    },
+    cpuManagerStatus() {
+      if (this.row?.isCPUManagerEnableInProgress) {
+        return this.t('generic.loading');
+      }
+
+      return this.row?.isCPUManagerEnabled ? this.t('generic.enabled') : this.t('generic.disabled');
+    },
+  }
+};
+</script>
+
+<template>
+  <span v-if="row?.isCPUManagerEnableInProgress" v-clean-tooltip="cpuManagerStatus">
+    <i class="icon icon-spinner icon-spin" />
+  </span>
+  <span v-else-if="row?.isCPUManagerEnabled" v-clean-tooltip="cpuManagerStatus">
+    <i class="icon icon-checkmark" />
+  </span>
+  <span
+    v-else
+    v-clean-tooltip="cpuManagerStatus"
+    class="text-muted"
+  >
+    &mdash;
+  </span>
+</template>
diff --git a/pkg/harvester/formatters/HarvesterCronExpression.vue b/pkg/harvester/formatters/HarvesterCronExpression.vue
new file mode 100644
index 00000000000..6755314f185
--- /dev/null
+++ b/pkg/harvester/formatters/HarvesterCronExpression.vue
@@ -0,0 +1,32 @@
+<script>
+import cronstrue from 'cronstrue';
+
+export default {
+  props: {
+    value: {
+      type:    String,
+      default: ''
+    },
+  },
+  computed: {
+    cronTooltipHint() {
+      let cronHint = '';
+
+      try {
+        cronHint = cronstrue.toString(this.value, { verbose: true });
+      } catch (e) {
+        cronHint = this.t('generic.invalidCron');
+      }
+
+      return cronHint || this.value.spec.cron;
+    }
+
+  }
+};
+</script>
+
+<template>
+  <span v-clean-tooltip="cronTooltipHint">
+    {{ value }}
+  </span>
+</template>
diff --git a/pkg/harvester/formatters/HarvesterMigrationState.vue b/pkg/harvester/formatters/HarvesterMigrationState.vue
index 8bcd5c23693..da42ebdc222 100644
--- a/pkg/harvester/formatters/HarvesterMigrationState.vue
+++ b/pkg/harvester/formatters/HarvesterMigrationState.vue
@@ -25,13 +25,25 @@ export default {
 
       return vmi;
     },
+<<<<<<< HEAD
     state() {
       return this.vmiResource?.migrationState?.status || '';
+=======
+    migrationState() {
+      return this.vmiResource?.migrationState?.status || '';
+    },
+    migrationBackground() {
+      return this.vmiResource?.migrationStateBackground || '';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     }
   },
 
   watch: {
+<<<<<<< HEAD
     state(neu) {
+=======
+    migrationState(neu) {
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       this.$emit('state-changed', neu);
     }
   },
@@ -39,9 +51,15 @@ export default {
 </script>
 
 <template>
+<<<<<<< HEAD
   <div v-if="state">
     <span v-if="!showSuccess">/</span>
     <BadgeState :label="vmiResource.migrationState.status" :color="vmiResource.migrationStateBackground" />
+=======
+  <div v-if="migrationState">
+    <span v-if="!showSuccess">/</span>
+    <BadgeState :label="migrationState" :color="migrationBackground" />
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   </div>
 </template>
 
diff --git a/pkg/harvester/formatters/HarvesterStorageUsed.vue b/pkg/harvester/formatters/HarvesterStorageUsed.vue
index e37f27c98b9..cb139854826 100644
--- a/pkg/harvester/formatters/HarvesterStorageUsed.vue
+++ b/pkg/harvester/formatters/HarvesterStorageUsed.vue
@@ -72,17 +72,35 @@ export default {
       return stats;
     },
 
+<<<<<<< HEAD
     units() {
+=======
+    allocatedUnits() {
+      const exponent = exponentNeeded(this.storageStats.total, 1024);
+
+      return `${ UNITS[exponent] }iB`;
+    },
+
+    usedUnits() {
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       const exponent = exponentNeeded(this.storageStats.maximum, 1024);
 
       return `${ UNITS[exponent] }iB`;
     },
 
+<<<<<<< HEAD
     used() {
       let out = this.formatter(this.storageStats.used);
 
       if (!Number.parseFloat(out) > 0) {
         out = this.formatter(this.storageStats.used, { canRoundToZero: false });
+=======
+    formatUsed() {
+      let out = this.formatter(this.storageStats.used);
+
+      if (!Number.parseFloat(out) > 0) {
+        out = this.formatter(this.storageStats.used, { canRoundToZero: true });
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       }
 
       return out;
@@ -92,7 +110,11 @@ export default {
       let out = this.formatter(this.storageStats.scheduled);
 
       if (!Number.parseFloat(out) > 0) {
+<<<<<<< HEAD
         out = this.formatter(this.storageStats.scheduled, { canRoundToZero: false });
+=======
+        out = this.formatter(this.storageStats.scheduled, { canRoundToZero: true });
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       }
 
       return out;
@@ -100,9 +122,15 @@ export default {
 
     usedAmountTemplateValues() {
       return {
+<<<<<<< HEAD
         used:  this.used,
         total: this.formatter(this.storageStats.maximum),
         unit:  this.units,
+=======
+        used:  this.formatUsed,
+        total: this.formatter(this.storageStats.maximum),
+        unit:  this.usedUnits,
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       };
     },
 
@@ -110,7 +138,11 @@ export default {
       return {
         used:  this.formatAllocated,
         total: this.formatter(this.storageStats.total),
+<<<<<<< HEAD
         unit:  this.units,
+=======
+        unit:  this.allocatedUnits,
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       };
     },
   },
@@ -141,7 +173,11 @@ export default {
       <ConsumptionGauge
         :capacity="storageStats.total"
         :used="storageStats.scheduled"
+<<<<<<< HEAD
         :units="units"
+=======
+        :units="allocatedUnits"
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         :number-formatter="formatter"
         :resource-name="resourceName"
       >
@@ -161,7 +197,11 @@ export default {
     <ConsumptionGauge
       :capacity="storageStats.maximum"
       :used="storageStats.used"
+<<<<<<< HEAD
       :units="units"
+=======
+      :units="usedUnits"
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       :number-formatter="formatter"
       :resource-name="showAllocated ? '' : resourceName"
       :class="{
diff --git a/pkg/harvester/l10n/en-us.yaml b/pkg/harvester/l10n/en-us.yaml
index d15fa9b7394..b7f57d02379 100644
--- a/pkg/harvester/l10n/en-us.yaml
+++ b/pkg/harvester/l10n/en-us.yaml
@@ -6,14 +6,25 @@ generic:
   labels: Labels
   inProgress: In Progress
   basic: Basic
+<<<<<<< HEAD
+=======
+  loading: Loading...
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 nav:
   group:
     networks: Networks
+<<<<<<< HEAD
     backupAndSnapshot: Backup & Snapshot
     Monitoring: Monitoring
     Logging: Logging
     'Monitoring & Logging': Monitoring & Logging
+=======
+    backupAndSnapshot: Backup and Snapshots
+    Monitoring: Monitoring
+    Logging: Logging
+    'Monitoring and Logging': Monitoring and Logging
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 resourceTable:
   groupBy:
@@ -28,7 +39,11 @@ members:
 
 asyncButton:
   restart:
+<<<<<<< HEAD
     action: Save & Restart
+=======
+    action: Save and Restart
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     success: Restarted
     waiting: Restarting&hellip;
 
@@ -38,9 +53,19 @@ harvester:
     backup:
       success: 'Backup { backUpName } has been initiated.'
       addBackup: Add Backup
+<<<<<<< HEAD
     restore:
       success: 'Restore { name } created successfully.'
       title: Backup and restore
+=======
+    quota:
+      editVMQuota: Edit VM Quota
+      editQuota: Edit Quota
+      bannerMessage: Set to empty string or 0 to remove total snapshot size quota.
+    restore:
+      success: 'Restore { name } created successfully.'
+      title: Backup and Restore
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       selectBackup: Select Backup
       message:
         backup: Please select the backup that needs to be restored.
@@ -52,23 +77,49 @@ harvester:
         tip: Please enter a template name!
         success: 'Template { templateName } created successfully.'
         failed: 'Failed generated template!'
+<<<<<<< HEAD
     cloneVM:
       title: Clone VM
       name: New VM Name
       type: clone volume data
+=======
+    schedule:
+      title: Create Schedule
+      message:
+        tip: Please enter a schedule name!
+        success: 'Schedule { name } created successfully.'
+        failed: 'Failed create schedule!'
+    cloneVM:
+      title: Clone Virtual Machine
+      name: New Virtual Machine Name
+      type: Clone volume data
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       action:
         create: Create
         clone: Clone
       message:
+<<<<<<< HEAD
         tip: Please enter a VM name!
         success: 'VM { name } cloned successfully.'
         failed: 'Failed clone VM!'
+=======
+        tip: Please enter a virtual machine name!
+        success: 'Virtual machine { name } cloned successfully.'
+        failed: 'Failed clone virtual machine!'
+        support:
+          longhorn: The virtual machine uses Longhorn v2 volumes, which do not <a href="https://docs.harvesterhci.io/v1.4/advanced/longhorn-v2/#limitations" target="_blank">support</a> the Clone action.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     exportImage:
       title: Export to Image
       name: Name
       namespace: Namespace
       message:
         success: 'Image { name } created successfully.'
+<<<<<<< HEAD
+=======
+        support:
+          longhorn: The volume uses Longhorn V2 engine, which does not <a href="https://docs.harvesterhci.io/v1.4/advanced/longhorn-v2/#limitations" target="_blank">support</a> the Export Image action.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     migration:
       failedMessage: Latest migration failed!
       title: Migration
@@ -77,11 +128,16 @@ harvester:
           label: Target Node
           placeholder: Choose Target Node
     ejectCDROM:
+<<<<<<< HEAD
       title: Eject CDROM
+=======
+      title: Eject CD-ROM
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       warnTip: Eject volume will restart the virtual machine.
       operationTip: 'Select the volume you want to delete:'
       delete: Delete
     bundle:
+<<<<<<< HEAD
       title: Generate Support Bundle
       url: Issue URL
       description: Description
@@ -92,27 +148,61 @@ harvester:
       title: Add Volume
     hotunplug:
       success: 'Volume { name } is detach successfully.'
+=======
+      title: Generate a Support Bundle
+      url: Issue URL
+      description: Description
+      requiredDesc: Description is required!
+      titleDescription: Collect system-related logs in Harvester to help with troubleshooting and support.
+    hotplug:
+      success: 'Volume { diskName } is mounted to the virtual machine { vm }.'
+      title: Add Volume
+    hotunplug:
+      success: 'Volume { name } is detached successfully.'
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     snapshot:
       title: Take Snapshot
       name: Name
       message:
         success: 'Take Snapshot { name } successfully.'
+<<<<<<< HEAD
+=======
+        support:
+          longhorn: The volume uses Longhorn V2 engine, which does not <a href="https://docs.harvesterhci.io/v1.4/advanced/longhorn-v2/#limitations" target="_blank">support</a> the Take Snapshot action.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     volumeClone:
       title: Clone Volume
       name: Name
       message:
         success: 'New Volume { name } cloned successfully.'
+<<<<<<< HEAD
+=======
+        support:
+          longhorn: The volume uses Longhorn V2 engine, which does not <a href="https://docs.harvesterhci.io/v1.4/advanced/longhorn-v2/#limitations" target="_blank">support</a> the Clone action.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     restoreSnapshot:
       title: Restore Snapshot
       name: 'New Volume Name'
       success: 'New Volume { name } restored successfully.'
     vmSnapshot:
+<<<<<<< HEAD
       title: Take VM Snapshot
       name: Name
       success: 'Take VM Snapshot { name } successfully.'
     restart:
       title: Restart VM
       tip: Restart the Virtual Machine now for configuration changes to take effect.
+=======
+      title: Take Virtual Machine Snapshot
+      name: Name
+      message:
+        success: 'Take virtual machine Snapshot { name } successfully.'
+        support:
+          longhorn: The VM uses Longhorn v2 volumes, which do not <a href="https://docs.harvesterhci.io/v1.4/advanced/longhorn-v2/#limitations" target="_blank">support</a> the Take Snapshot action.
+    restart:
+      title: Restart Virtual Machine
+      tip: Restart the virtual machine for configuration changes to take effect.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       cancel: Save
   notification:
     title:
@@ -121,7 +211,11 @@ harvester:
       warning: Warning
       error: Error
   action:
+<<<<<<< HEAD
     createVM: Create a Virtual Machine
+=======
+    createVM: Create Virtual Machine
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     start: Start
     restart: Restart
     softreboot: Soft Reboot
@@ -130,6 +224,7 @@ harvester:
     deepClone: Clone
     shallowClone: Clone Template
     unpause: Unpause
+<<<<<<< HEAD
     ejectCDROM: Eject CDROM
     launchFormTemplate: Launch instance from template
     modifyTemplate: Modify template (Create new version)
@@ -138,12 +233,33 @@ harvester:
     backup: Take Backup
     restore: Restore
     restoreNewVM: Restore New
+=======
+    encryptImage: Encrypt Image
+    decryptImage: Decrypt Image
+    ejectCDROM: Eject CD-ROM
+    editVMQuota: Edit Virtual Machine Quota
+    launchFormTemplate: Launch instance from template
+    modifyTemplate: Modify template (Create new version)
+    setDefaultVersion: Set default version
+    addTemplateVersion: Add template version
+    backup: Take Backup
+    createSchedule: Create Schedule
+    restore: Restore
+    restoreNewVM: Restore New
+    resumeSchedule: Resume
+    suspendSchedule: Suspend
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     restoreExistingVM: Replace Existing
     migrate: Migrate
     abortMigration: Abort Migration
     createTemplate: Generate Template
     enableMaintenance: Enable Maintenance Mode
     disableMaintenance: Disable Maintenance Mode
+<<<<<<< HEAD
+=======
+    enableCPUManager: Enable CPU Manager
+    disableCPUManager: Disable CPU Manager
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     cordon: Cordon
     uncordon: Uncordon
     addHotplug: Add Volume
@@ -152,23 +268,48 @@ harvester:
     cancelExpand: Cancel Expand
     snapshot: Take Snapshot
     pvcClone: Clone Volume
+<<<<<<< HEAD
     vmSnapshot: Take VM Snapshot
+=======
+    vmSnapshot: Take Virtual Machine Snapshot
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     shutdown: Shut Down
     powerOn: Power On
     reboot: Reboot
     forceStop: Force Stop
   tableHeaders:
+<<<<<<< HEAD
     size: Size
     progress: Progress
     message: Message
     phase: Phase
     attachedVM: Attached VM
+=======
+    imageEncryption: Encryption
+    size: Size
+    virtualSize: Virtual Size
+    progress: Progress
+    message: Message
+    phase: Phase
+    attachedVM: Attached Virtual Machine
+    cpuManager: CPU Manager
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     fingerprint: Fingerprint
     value: Value
     actions: Actions
     readyToUse: Ready To Use
     backupTarget: Backup Target
+<<<<<<< HEAD
     targetVm: Target VM
+=======
+    targetVm: Target Virtual Machine
+    cronExpression: Cron Expression
+    retain: Retain
+    scheduleType: Type
+    maxFailure: Max Failure
+    sourceVm: Source Virtual Machine
+    vmSchedule: Virtual Machine Schedule
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     hostIp: Host IP
     vm:
       ipAddress: IP Address
@@ -176,10 +317,18 @@ harvester:
       defaultVersion: Default Version
     network:
       type: Type
+<<<<<<< HEAD
       vlan: Vlan ID
     snapshotTargetVolume: Original Volume
     volumeSnapshotCounts: Snapshot Counts
     networkState: Network State
+=======
+      vlan: VLAN ID
+    snapshotTargetVolume: Original Volume
+    volumeSnapshotCounts: Snapshot Counts
+    networkState: Network State
+    totalSnapshotQuota: Total Snapshot Quota
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     storageClass: Storage Class
     restore: Restore
   tab:
@@ -188,8 +337,16 @@ harvester:
     advanced: Advanced Options
     accessCredentials: Access Credentials
     pciDevices: PCI Devices
+<<<<<<< HEAD
     vGpuDevices: VGPU Devices
     vmScheduling: VM Scheduling
+=======
+    vGpuDevices: vGPU Devices
+    usbDevices: USB Devices
+    vmScheduling: Virtual Machine Scheduling
+    quotas: Quotas
+    snapshots: Snapshots
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     instanceLabel: Instance Labels
   fields:
     version: Version
@@ -200,6 +357,7 @@ harvester:
     volume: Volume
     network: Network
     model: Model
+<<<<<<< HEAD
     macAddress: Mac Address
     port: Port
     protocol: Protocol
@@ -213,11 +371,31 @@ harvester:
     filterLabels: Filter Labels
     storageClass: Storage Class
     dockerImage: Docker Image 
+=======
+    macAddress: MAC address
+    port: Port
+    protocol: Protocol
+    remove: Remove
+    PhysicalNic: Physical NIC
+    cpu: CPU
+    memory: Memory
+    virtualName: Virtual machine name
+    promiscuous: Promiscuous
+    ipv4Address: IPv4 address
+    filterLabels: Filter labels
+    filterSchedule: Filter schedule
+    storageClass: Storage class
+    dockerImage: Docker image
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   pci:
     available: Available Devices
     compatibleNodes: Compatible Nodes
     impossibleSelection: 'There are no hosts with all of the selected devices.'
+<<<<<<< HEAD
     howToUseDevice: 'Use the table below to enable PCI passthrough on each device you want to use in this VM.'
+=======
+    howToUseDevice: 'Use the table below to enable PCI passthrough on each device you want to use in this virtual machine.'
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     deviceInTheSameHost: 'You can only select devices on the same host.'
     oldFormatDevices:
       help: |-
@@ -228,11 +406,19 @@ harvester:
           {oldFormatDevicesHTML}
         </ul>
         <p>
+<<<<<<< HEAD
           Please use the following instructions to update the VM:
         </p>
         <ol>
           <li>Stop the VM, edit the VM YAML, and remove the <Code>hostDevices</Code> section, and save VM the changes to the YAML file.</li>
           <li>Edit the VM, and add the already enabled PCIDevice from the list of available PCIDevices, and save and start VM.</li>
+=======
+          Please use the following instructions to update the virtual machine:
+        </p>
+        <ol>
+          <li>Stop the virtual machine, edit the virtual machine YAML, and remove the <Code>hostDevices</Code> section, and save virtual machine the changes to the YAML file.</li>
+          <li>Edit the virtual machine, and add the already enabled PCI Device from the list of available PCIDevices, and save and start VM.</li>
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         </ol>
     showCompatibility: Show device compatibility matrix
     hideCompatibility: Hide device compatibility matrix
@@ -241,6 +427,7 @@ harvester:
     cantUnclaim: You cannot disable passthrough on a device claimed by another user.
     enableGroup: Enable Group
     disableGroup: Disable Group
+<<<<<<< HEAD
     labelRequired: "This rule should not be manually altered: it ensures that the PCI devices selected for this virtual machine are available on the VM's host."
     goSetting:
       prefix: The pcidevices-controller addon is not enabled, click
@@ -250,6 +437,20 @@ harvester:
     enablePassthroughWarning: Please be careful not to use host-owned PCI devices (e.g., management and VLAN NICs). Incorrect device allocation may cause damage to your cluster, including node failure.
     matrixHostName: Host Name
     matrixDeviceClaimName: Device Claim Name
+=======
+    labelRequired: "This rule should not be manually altered: it ensures that the PCI devices selected for this virtual machine are available on the virtual machine's host."
+    goSetting:
+      prefix: The pcidevices-controller add-on is not enabled, click
+      middle: here
+      suffix: to enable the add-on to successfully manage your PCI devices.
+    noPCIPermission: Please contact your system administrator to enable the PCI devices first.
+    enablePassthroughWarning: Please be careful not to use host-owned PCI devices (e.g., management and VLAN NICs). Incorrect device allocation may cause damage to your cluster, including node failure.
+
+  devices:
+    matrixHostName: Host Name
+    matrixDeviceClaimName: Device Claim Name
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   generic:
     close: Close
     open: Open
@@ -300,13 +501,18 @@ harvester:
       events:
         label: Events
       vmMetrics:
+<<<<<<< HEAD
         label: VM Metrics
+=======
+        label: Virtual Machine Metrics
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
     version: Version
   host:
     console: Console
     label: Hosts
     inconsistentIP: "Host IP is inconsistent, current IP: { currentIP }, initial IP: { initIP }"
+<<<<<<< HEAD
     promote:
       none: ' '
       running: promoting
@@ -314,6 +520,16 @@ harvester:
       unknown: promote halted
       promoteRestart: restarting
       promoteSucceed: promote completed
+=======
+    noConsoleUrl: 'Console URL not specified'
+    promote:
+      none: ' '
+      running: Promoting
+      failed: Promote failed
+      unknown: Promote halted
+      promoteRestart: Restarting
+      promoteSucceed: Promote completed
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     tabs:
       network: Network
       overview: Overview
@@ -323,10 +539,17 @@ harvester:
       storage: Storage
       labels: Labels
       ksmtuned: Ksmtuned
+<<<<<<< HEAD
       seeder: Out-of-Band Access
     detail:
       kvm:
         disableMessage: Hardware-based virtualization is disabled or not supported. Hardware-based virtualization must be enabled before creating any Virtual Machines.
+=======
+      seeder: Out-of-band Access
+    detail:
+      kvm:
+        disableMessage: Hardware-based virtualization is disabled or not supported. Hardware-based virtualization must be enabled before creating any virtual machines.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       title:
         network: Network Configuration
       hostIP: Host IP
@@ -350,10 +573,18 @@ harvester:
       serialNumber: Serial Number
       model: Model
       etcd: Witness Node
+<<<<<<< HEAD
     enableMaintenance:
       title: Enable Maintenance Mode
       protip: The operation will migrate all virtual machines on this node to other nodes.
       shutDownVMs: Check <b>Force</b> option to shutdown VMs which cannot be migrated in live mode.
+=======
+      cpuManager: CPU Manager
+    enableMaintenance:
+      title: Enable Maintenance Mode
+      protip: The operation will migrate all virtual machines on this node to other nodes.
+      shutDownVMs: Check <b>Force</b> option to shutdown virtual machines which cannot be migrated in live mode.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       force: Force
     cordon:
       title: Cordon
@@ -362,17 +593,29 @@ harvester:
       run: Run Strategy
       configure: Configure
       mode: Mode
+<<<<<<< HEAD
       modeLink: Mode <a href="https://docs.harvesterhci.io/v1.3/host/#ksmtuned-mode" target="_blank"><i class="icon icon-info" /></a>
       thresCoef: Threshold Coefficient
       enableMergeNodes: Enable Merge Across Nodes
+=======
+      modeLink: Mode <a href="{url}" target="_blank"><i class="icon icon-info" /></a>
+      thresCoef: Threshold Coefficient
+      enableMergeNodes: Enable merging across nodes
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       enable: Enable
       disable: Disable
       ksmStatus: KSM Status
       modeOption:
         standard: Standard
+<<<<<<< HEAD
         high: High-Perfomanace
         customized: Customized
       parameters: 
+=======
+        high: High-performance
+        customized: Customized
+      parameters:
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         title: Ksmtuned Parameters
         boost: Boost
         decay: Decay
@@ -407,7 +650,11 @@ harvester:
         label: Eviction Requested
       forceFormatted:
         label: Force Formatted
+<<<<<<< HEAD
         toolTip: Force formatted will cleanup disk data, make sure you backup all available data to prevent data loss.
+=======
+        toolTip: Force formatted will clean up disk data, make sure you backup all available data to prevent data loss.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         yes: Yes (Ext4 File System)
       description:
         label: Description
@@ -424,11 +671,30 @@ harvester:
         addLabel: Add Disk Tag
       conditions: Conditions
       storageAvailable:
+<<<<<<< HEAD
         label: Storage Available 
+=======
+        label: Storage Available
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       storageScheduled:
         label: Storage Scheduled
       storageMaximum:
         label: Storage Maximum
+<<<<<<< HEAD
+=======
+      provisioner: Provisioner
+      lvmVolumeGroup:
+        label: Volume Group
+        create: Create New...
+      storage:
+        longhorn:
+          LonghornV1:
+            label: Longhorn V1 (CSI)
+          LonghornV2:
+            label: Longhorn V2 (CSI)
+        lvm:
+          label: LVM
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     tags:
       label: Host Tags
       addLabel: Add Host Tag
@@ -440,8 +706,13 @@ harvester:
       tips: You can configure multiple IPv4 addresses or host addresses.
       placeholder: e.g. IPv4
       ntpSyncStatus:
+<<<<<<< HEAD
         isDisabled: 'The NTP is disabled. Please check the NTP service is active.'
         isUnsynced: 'The time is not synchronized with the NTP server {current}'
+=======
+        isDisabled: 'NTP is disabled. Please check the NTP service is active.'
+        isUnsynced: 'NTP is not synchronized with the NTP server {current}.'
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
   virtualMachine:
     label: Virtual Machines
@@ -454,7 +725,11 @@ harvester:
         nameLabel: Name
         host:
           label: Hostname
+<<<<<<< HEAD
           placeholder: default to the virtual machine name.
+=======
+          placeholder: Default to the virtual machine name.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       multiple:
         label: Multiple Instance
         nameNsDescription: Name prefix for each instance
@@ -463,20 +738,34 @@ harvester:
         nameLabel: Name Prefix
         host:
           label: Host Prefix Name
+<<<<<<< HEAD
           placeholder: default to the virtual machine name.
     useTemplate:
       label: "Use VM Template:"
+=======
+          placeholder: Default to the virtual machine name.
+    useTemplate:
+      label: "Use the virtual machine template:"
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       template:
         label: Template
       version:
         label: Version
     console:
+<<<<<<< HEAD
       novnc: Open in Web VNC
+=======
+      novnc: Open in WebVNC
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       serial: Open in Serial Console
     promptRemove:
       title: 'Select the volume you want to delete:'
       deleteAll: Delete All
+<<<<<<< HEAD
       tips: "Warn: The snapshots of vm will be deleted with VM and the snapshots of volume will be deleted with volume."
+=======
+      tips: "Warn: The snapshots of the virtual machine will be deleted with virtual machine and the snapshots of volume will be deleted with volume."
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     unplug:
       title: 'Are you sure that you want to detach volume {name} ?'
       actionLabel: Detach
@@ -488,6 +777,21 @@ harvester:
         other {Start}
       } the virtual machine now to take effect of the configuration changes.
     runStrategy: Run Strategy
+<<<<<<< HEAD
+=======
+    maintenanceStrategy:
+      label: Maintenance Strategy
+      options:
+        Migrate: Migrate
+        ShutdownAndRestartAfterEnable: Shutdown and Restart After Enable
+        ShutdownAndRestartAfterDisable: Shutdown and Restart After Disable
+        Shutdown: Shutdown
+    cpuPinning:
+      label: Enable CPU Pinning
+      tooltip: Enable CPU Pinning brings better performance and reduce latency for the virtual machine
+      restartVMMessage: Changing the CPU Pinning setting requires a virtual machine reboot for the change to take effect
+      migrationMessage: This virtual machine can only be migrated to a target node that has CPU Manager enabled, as CPU Pinning is configured.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     restartNow: |-
       {restart, select,
         true {Restart}
@@ -498,6 +802,13 @@ harvester:
     enableUsb: Enable USB Tablet
     advancedOptions:
       tpm: Enable TPM
+<<<<<<< HEAD
+=======
+      cpuManager:
+        prefix: You must enable CPU Manager for at least one node in
+        middle: 'host page'
+        suffix: to enable CPU Pinning for VM
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     usbTip: Provides an absolute pointer device which often helps with getting a consistent mouse cursor position in VNC.
     sshTitle: Add Public SSH Key
     imageTip: An external URL to the .iso, .img, .qcow2 or .raw that the virtual machine should be created from.
@@ -505,22 +816,41 @@ harvester:
     secureBoot: Secure Boot
     volume:
       dragTip: Drag and drop volumes, or use the volume's arrows, to change the boot order.
+<<<<<<< HEAD
       volumeTip: The VM only contains a cd-rom volume. You may want to add additional disk volumes.
+=======
+      volumeTip: The virtual machine only contains a CD-ROM volume. You may want to add additional disk volumes.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       macTip: "MAC address as seen inside the guest system."
       volumeUpdate: 'Set volume { name } successfully'
       type: Type
       size: Size
       edit: Edit
       bus:  Bus
+<<<<<<< HEAD
+=======
+      readyToUse: Ready To Use
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       bootOrder: Boot Order
       volume: Volume
       dockerImage: Docker Image
       addVolume: Add Volume
       addExistingVolume: Add Existing Volume
+<<<<<<< HEAD
       addVmImage: Add VM Image
       addContainer: Add Container
       setFirst: Set as root volume
       saveVolume: Update Volume
+=======
+      addVmImage: Add a Virtual Machine Image
+      addContainer: Add Container
+      setFirst: Set as root volume
+      saveVolume: Update Volume
+      encryption: Encryption
+      lockTooltip:
+        all: All volumes are encrypted.
+        partial: Some volumes are encrypted.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       title:
         vmImage: Image Volume
         existingVolume: Existing Volume
@@ -534,7 +864,11 @@ harvester:
       addNetwork: Add Network
       addPort:  Add Port
     cloudConfig:
+<<<<<<< HEAD
       title: Cloud Config
+=======
+      title: Cloud Configuration
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       createTemplateTitle: 'Create {name}.'
       createNew: Create new...
       cloudInit:
@@ -547,23 +881,41 @@ harvester:
       network:
         label: Network Data Template
         title: "Network Data:"
+<<<<<<< HEAD
         tip: "The network-data configuration allows you to customize the instance’s networking interfaces by assigning subnet configuration, virtual device creation (bonds, bridges, vlans) routes and DNS configuration. <a href='https://cloudinit.readthedocs.io/en/latest/reference/network-config-format-v1.html' target='_blank'>Learn more</a>"
     scheduling:
       affinity:
         anyNode: 'Run VM on any available node'
         schedulingRules: 'Run VM on node(s) matching scheduling rules'
         specificNode: Run VM on specific node - (Live migration is not supported)
+=======
+        tip: "The network-data configuration allows you to customize the instance’s networking interfaces by assigning subnet configuration, virtual device creation (bonds, bridges, VLANs) routes and DNS configuration. <a href='https://cloudinit.readthedocs.io/en/latest/reference/network-config-format-v1.html' target='_blank'>Learn more</a>"
+    scheduling:
+      affinity:
+        anyNode: 'Run virtual machine on any available node'
+        schedulingRules: 'Run virtual machine on node(s) matching scheduling rules'
+        specificNode: Run virtual machine on specific node - (Live migration is not supported)
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       networkNotSupport: Network not support schedule
     accessCredentials:
       resetPwd:
         label: Add Basic Auth
       injectSSH:
+<<<<<<< HEAD
         label: Add SSHKey
         users: Select Users
         addUser: Add User
       tips: qemu-guest-agent must be installed to enable Access Credentials, the VM should be restarted after credentials added. Need to enter the VM to edit password or remove SSH-Key after deleting the credentials.
       userTips: The user to be added must already exist; otherwise, the credentials will not take effect.
       duplicatedUser: User already exist.
+=======
+        label: Add SSH Key
+        users: Select Users
+        addUser: Add User
+      tips: qemu-guest-agent must be installed to enable the accessing of credentials. The virtual machine needs to be restarted after credentials added. You need to be in the virtual machine to edit your password or remove an SSH-Key after deleting the credentials.
+      userTips: The user to be added must already exist; otherwise, the credentials will not take effect.
+      duplicatedUser: User already exists.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       invalidUser: Invalid Username.
     input:
       name: Name
@@ -594,8 +946,13 @@ harvester:
         instance: Virtual Machines
         monitor: Monitor Data
         keypairs: SSH Keys
+<<<<<<< HEAD
         cloudConfig: Cloud Config
         metrics: VM Metrics
+=======
+        cloudConfig: Cloud Configuration
+        metrics: Virtual Machine Metrics
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       details:
         title:
           vmDetails: Virtual Machine Details
@@ -603,6 +960,10 @@ harvester:
           services: Services
           users: Logged in users
         name: Name
+<<<<<<< HEAD
+=======
+        totalSnapshotQuota: Total Snapshot Quota
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         namespace: Namespace
         created: Created
         hostname: Hostname
@@ -624,7 +985,11 @@ harvester:
         flavor: Flavor
         tolerations: Tolerations
         dedicatedResources: Dedicated Resources
+<<<<<<< HEAD
         down: VM not running
+=======
+        down: Virtual machine not running
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         affinityRules: Affinity Rules
         sourceNode: Source Node
         targetNode: Target Node
@@ -637,7 +1002,11 @@ harvester:
         from: Generated from
         down: No events in the past hour
       console:
+<<<<<<< HEAD
         down: This Virtual Machine is down. Please start it to access its console.
+=======
+        down: This virtual machine is down. Please start it to access its console.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         shortcutKeys: Shortcut Keys
         customShortcutKeys: Custom Shortcut Keys
         management: Management Shortcut Keys
@@ -645,13 +1014,21 @@ harvester:
           start: Record
           recording: Recording
           stop: Stop Recording
+<<<<<<< HEAD
           tips: Pressing the record button will capture your keyboard inputs.
+=======
+          tips: Press the record button to capture your keyboard inputs.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
           send: Send
           preferredKeys: Preferred Custom Shortcut Keys
     terminationGracePeriodSeconds:
       label: Termination Grace Period
     affinity:
+<<<<<<< HEAD
       thisPodNamespace: This VM's namespace
+=======
+      thisPodNamespace: This virtual machine's namespace
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       matchExpressions:
         inNamespaces: "Workloads in these namespaces"
       namespaces:
@@ -669,7 +1046,11 @@ harvester:
     kind: Kind
     sourceOptions:
       new: New
+<<<<<<< HEAD
       vmImage: VM Image
+=======
+      vmImage: Virtual Machine Image
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     image: Image
     frontend: Frontend
     blockdev: Block Device
@@ -681,10 +1062,19 @@ harvester:
     lastBackupAt: Last Backup At
     replicasNumber: Replicas Number
     promptRemove:
+<<<<<<< HEAD
       tips: "Warn: The snapshots of volume will be deleted with volume."
     externalLink:
       tips: Check volume details
     rebuildingMessage: 'Rebuilding: {percentage}%'
+=======
+      tips: "Warn: The volume's snapshots will be deleted with this volume."
+    externalLink:
+      tips: Check volume details
+    rebuildingMessage: 'Rebuilding: {percentage}%'
+    longhorn:
+      disableResize: 'Longhorn V2 volumes cannot be resized.'
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
   image:
     label: Images
@@ -692,6 +1082,7 @@ harvester:
       basics: Basics
     url: URL
     size: Size
+<<<<<<< HEAD
     urlTip: 'supports the <code>raw</code> and <code>qcow2</code> image formats which are supported by <a href="https://www.qemu.org/docs/master/system/images.html#disk-image-file-formats" target="_blank">qemu</a>. Bootable ISO images can also be used and are treated like <code>raw</code> images.'
     fileName: File Name
     uploadFile: Upload File
@@ -699,6 +1090,23 @@ harvester:
     sourceType:
       download: URL
       upload: File
+=======
+    isEncryption: Encryption
+    encryptionSecret: Encryption Secret
+    virtualSize: Virtual Size
+    urlTip: 'Supports the <code>raw</code> and <code>qcow2</code> image formats which are supported by <a href="https://www.qemu.org/docs/master/system/images.html#disk-image-file-formats" target="_blank">qemu</a>. Bootable ISO images can also be used and are treated like <code>raw</code> images.'
+    fileName: File Name
+    uploadFile: Upload File
+    source: Source Type
+    sourceType:
+      download: URL
+      upload: File
+      clone: Clone
+      encrypt: Encrypt
+      decrypt: Decrypt
+    sourceImage: Source Image
+    cryptoOperation: Crypto Operation
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     warning:
       uploading: |-
         {count, plural,
@@ -717,10 +1125,17 @@ harvester:
     tips:
       notExistImage:
         title: Image {name} does not exist!
+<<<<<<< HEAD
         message: Please select a new Image.
       notExistNode:
         title: Node {name} does not exist!
         message: Please select a new Node.
+=======
+        message: Please select a new image.
+      notExistNode:
+        title: Node {name} does not exist!
+        message: Please select a new node.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
   upgradePage:
     upgradeApp: Upgrade Software
@@ -737,8 +1152,13 @@ harvester:
     selectExisting: Select Existing Image
     createRepository: Creating Upgrade Repository
     succeeded: Succeeded
+<<<<<<< HEAD
     releaseTip: Please read the upgrade documentation carefully. You can view details on the <a href="{url}" target="_blank">Harvester Release Note</a>.
     checkReady: I have read and understood the upgrade content related to this Harvester version.
+=======
+    releaseTip: Please read the upgrade documentation carefully. You can view details on the <a href="{url}" target="_blank">Harvester Release Notes</a>.
+    checkReady: I have read and understood the upgrade instructions related to this Harvester version.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     pending: Pending
     repoInfo:
       upgradeStatus: Upgrade Status
@@ -748,34 +1168,91 @@ harvester:
       harvesterChart: Harvester Chart
       success: Success
       fail:  Fail
+<<<<<<< HEAD
       ongoing: on-going
+=======
+      ongoing: On-going
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       downloadLog: Download Log
       logStatus: Log Download Status
     dismissMessage: Dismiss it
     upgradeInfo:
       warning: WARNING
+<<<<<<< HEAD
       doc: Read the <a href="https://docs.harvesterhci.io/v1.3/upgrade/index" target="_blank">documentation</a> before starting the upgrade process. Ensure that you complete procedures that are relevant to your environment and the version you are upgrading to.
       tip: Unmet system requirements and incorrectly performed procedures may cause complete upgrade failure and other issues that require manual workarounds.
       moreNotes: For more details about the release notes, please visit - 
 
   backup:
     label: VM Backups
+=======
+      doc: Read the <a href="{url}" target="_blank">documentation</a> before starting the upgrade process. Ensure that you complete procedures that are relevant to your environment and the version you are upgrading to.
+      tip: Unmet system requirements and incorrectly performed procedures may cause complete upgrade failure and other issues that require manual workarounds.
+      moreNotes: For more details about the release notes, please visit -
+     
+  schedule:
+    label: Virtual Machine Schedules
+    createTitle: Create Schedule
+    createButtonText: Create Schedule
+    scheduleType: Virtual Machine Schedule Type
+    cron: Cron Schedule
+    detail: 
+      namespace: Namespace
+      sourceVM: Source Virtual Machine
+    tabs:
+      basic: Basic
+      backups: Backups
+      snapshots: Snapshots
+    message:
+      noSetting:
+        suffix: before creating a backup schedule
+    retain: 
+      label: Retain
+      count: Count
+      tooltip: Number of up-to-date VM backups to retain. Maximum to 250, minimum to 2. 
+    maxFailure:
+      label: Max Failure 
+      count: Count
+      tooltip: Max number of consecutive failed backups that could be tolerated. If reach this threshold, Harvester controller will suspend the schedule job. This value should less than retain count
+    virtualMachine:
+      title: Virtual Machine Name
+      placeholder: Select a virtual machine
+    type:
+      snapshot: Snapshot
+      backup: Backup
+
+  backup:
+    label: Virtual Machine Backups
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     createText: Restore Backup
     title: Restore Virtual Machine
     backupTargetTip: The endpoint used to access the backupstore. NFS and S3 are supported.
     message:
       noSetting:
+<<<<<<< HEAD
         prefix: You must configure the backup target in
         middle: 'setting'
         suffix: before creating a new backup.
       errorTip:
         prefix: Backup Target value in
         middle: Setting
+=======
+        prefix: You must configure the backup target
+        middle: 'setting'
+        suffix: before creating a new backup.
+      errorTip:
+        prefix: Backup target value in
+        middle: setting
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         suffix: "is invalid, error: "
       viewSetting:
         prefix: Click
         middle: here
+<<<<<<< HEAD
         suffix: to view the backup config.
+=======
+        suffix: to view the backup configuration.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       testConnect:
         actionLabel: Test connection
         waitingLabel: Testing connection...
@@ -789,13 +1266,20 @@ harvester:
       virtualMachineName: Virtual Machine Name
       keepMacAddress: Keep MAC Address
     matchTarget: The current backup target does not match the existing one.
+<<<<<<< HEAD
     progress: 
+=======
+    progress:
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       details: Volume details
       tooltip:
         starting: Backup initiating
         progress: Backup in progress
         complete: Backup completed
+<<<<<<< HEAD
 
+=======
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   restore:
     progress:
       details: Volume details
@@ -805,12 +1289,17 @@ harvester:
         complete: Restore completed
 
   network:
+<<<<<<< HEAD
     label: VM Networks
+=======
+    label: Virtual Machine Networks
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     tabs:
       basics: Basics
       layer3Network: Route
     clusterNetwork:
       label: Cluster Network
+<<<<<<< HEAD
       create: Create a New Cluster Network
       toolTip: Define your custom cluster scope network name
       createPlaceholder: Input a new Cluster Network name
@@ -820,6 +1309,17 @@ harvester:
       mode:
         label: Mode
         auto: Auto(DHCP)
+=======
+      create: Create a new cluster network
+      toolTip: Define your custom cluster scope network name
+      createPlaceholder: Input a new cluster network name
+      selectOrCreatePlaceholder: Select or create a new cluster network
+      selectPlaceholder: Select a cluster network
+    layer3Network:
+      mode:
+        label: Mode
+        auto: Auto (DHCP)
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         manual: Manual
       serverIPAddr:
         label: DHCP Server IP
@@ -843,11 +1343,20 @@ harvester:
     validation:
       physicalNIC: DefaultPhysicalNIC
     placeholder:
+<<<<<<< HEAD
       accessKeyId: specify your access key id
       secretAccessKey: specify your secret access key
       cert: upload a self-signed SSL certificate
     vlanChangeTip: The newly modified default network interface only applies to newly added nodes, not existing ones.
     defaultPhysicalNIC: Default Network Interface
+=======
+      accessKeyId: Specify your access key ID
+      secretAccessKey: Specify your secret access key
+      cert: Upload a self-signed SSL certificate
+    vlanChangeTip: The newly modified default network interface only applies to newly added nodes, not existing ones.
+    defaultPhysicalNIC: Default Network Interface
+    modifiedMessage: Settings that have been customized from default settings are tagged with 'Modified'.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     percentTip: The value in parentheses represents the distribution percentage of the network interface on all hosts. If an interface less than 100% is selected, the user needs to manually specify the network interface on the host where the vlan network configuration fails.
     message:
       ca:
@@ -870,10 +1379,18 @@ harvester:
         placeholder: e.g. 172.16.0.1/32
         invalid: '"Exclude list" is invalid.'
         addIp: Add Exclude IP
+<<<<<<< HEAD
       warning: 'WARNING: <br/> Any change to storage-network requires shutting down all VMs before applying this setting. <br/> Users have to ensure the Cluster Network is configured and VLAN Config will cover all nodes and ensure the network connectivity is working and expected in all nodes.'
       tip: 'Specify an IP range in the IPv4 CIDR format. <code>Number of IPs Required = Number of Nodes * 4 + Number of Disks * 2 + Number of Images to Download/Upload </code>. For more information about storage network settings, see the <a href="https://docs.harvesterhci.io/v1.3/advanced/storagenetwork#configuration-example" target="_blank">documentation</a>.'
     vmForceDeletionPolicy:
       period: Period
+=======
+      warning: 'WARNING: <br/> Any change to storage-network requires shutting down all virtual machines before applying this setting. <br/> Users have to ensure the cluster network is configured and VLAN Configuration will cover all nodes and ensure the network connectivity is working and expected in all nodes.'
+      tip: 'Specify an IP range in the IPv4 CIDR format. <code>Number of IPs Required = Number of Nodes * 4 + Number of Disks * 2 + Number of Images to Download/Upload </code>. For more information about storage network settings, see the <a href="{url}" target="_blank">documentation</a>.'
+    vmForceDeletionPolicy:
+      period: Period
+    ratio : Ratio
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     autoRotateRKE2Certs:
       expiringInHours: Expiring in
     httpProxy:
@@ -896,7 +1413,11 @@ harvester:
           addRewrite: Add Rewrite
         addMirror: Add Mirror
       configs:
+<<<<<<< HEAD
         configs: Configs
+=======
+        configs: Configurations
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         registryEDQNorIP: Registry FDQN or IP
         registryPlaceholder: myregistry.local:5000
         username: Username
@@ -904,11 +1425,19 @@ harvester:
         auth: Auth
         identityToken: Identity Token
         insecureSkipVerify: InsecureSkipVerify
+<<<<<<< HEAD
         addConfig: Add Config
 
     upgrade:
       selectExitImage: Please select the OS image to upgrade.
       imageUrl: Please input a valid image url.
+=======
+        addConfig: Add Configuration
+
+    upgrade:
+      selectExitImage: Please select the OS image to upgrade.
+      imageUrl: Please input a valid image URL.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       chooseFile: Please select to upload an image.
       checksum: Checksum
     harvesterMonitoring:
@@ -924,16 +1453,28 @@ harvester:
         retention: How long to retain metrics
         retentionSize: Maximum size of metrics
     clusterRegistrationUrl:
+<<<<<<< HEAD
       message: To completely unset the imported Harvester cluster, please also remove it on the Rancher dashboard UI via the <code> Virtualization Management </code> page.
+=======
+      message: To completely unset the imported Harvester cluster, please also remove it on the Rancher Dashboard UI via the <code> Virtualization Management </code> page.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     ntpServers:
       isNotIPV4: The address you entered is not IPv4 or host. Please enter a valid IPv4 address or a host address.
       isDuplicate: There are duplicate NTP server configurations.
   cloudTemplate:
+<<<<<<< HEAD
     label: Cloud Config Templates
     templateType: Template Type
     userData: User Data
     networkData: Network Data
  
+=======
+    label: Cloud Configuration Templates
+    templateType: Template Type
+    userData: User Data
+    networkData: Network Data
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   support:
     title: Harvester Support
     kubeconfig:
@@ -942,7 +1483,11 @@ harvester:
     internal:
       rancher:
         title: Access Embedded Rancher UI
+<<<<<<< HEAD
         titleDescription: You can only use the embedded Rancher UI for debugging and validation purposes. For more information about how Harvester integrates with Rancher, see the <a target="_blank" href="https://docs.harvesterhci.io/v1.3/rancher/rancher-integration" rel="noopener noreferrer nofollow">documentation</a>.
+=======
+        titleDescription: You can only use the embedded Rancher UI for debugging and validation purposes. For more information about how Harvester integrates with Rancher, see the <a target="_blank" href="{url}" rel="noopener noreferrer nofollow">documentation</a>.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       longhorn:
         title: Access Embedded Longhorn UI
         titleDescription: We only support to use the embedded Longhorn UI for debugging and validation purpose.
@@ -962,7 +1507,11 @@ harvester:
     cidr:
       label: CIDR/IP Range
       invalid: '"CIDR/IP Range" is invalid.'
+<<<<<<< HEAD
       toolTip: "We can apply multiple pools or ranges by seperating them with commas. i.e. 192.168.0.200/30,192.168.0.200/29 or 192.168.0.10-192.168.0.11"
+=======
+      toolTip: "We can apply multiple pools or ranges by separating them with commas. For example: 192.168.0.200/30,192.168.0.200/29 or 192.168.0.10-192.168.0.11"
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     add:
       label: Add IP Pools
 
@@ -971,11 +1520,16 @@ harvester:
       label: Protocols
     ciphers:
       label: Ciphers
+<<<<<<< HEAD
   
+=======
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   monitoring:
     configuration:
       label: Configuration
     alertmanagerConfig:
+<<<<<<< HEAD
       label: Alertmanager Configs
       diabledMonitoringTips:
         prefix: 'You must enable'
@@ -987,6 +1541,19 @@ harvester:
         suffix: 'for configs to take effect.'
       disabledAddon:
         prefix: 'Monitoring Addon is disabled now, click'
+=======
+      label: Alertmanager Configurations
+      diabledMonitoringTips:
+        prefix: 'Enable the'
+        middle: 'monitoring'
+        suffix: 'add-on first.'
+      diabledAlertingTips:
+        prefix: 'Enable'
+        middle: 'Alertmanager'
+        suffix: 'for configuration to take effect.'
+      disabledAddon:
+        prefix: 'The monitoring add-on is disabled, click'
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         middle: 'here'
         suffix: 'to enable it.'
 
@@ -996,6 +1563,7 @@ harvester:
         fluentbit: Fluentbit
         fluentd: Fluentd
     clusterFlow:
+<<<<<<< HEAD
       label: Cluster Flow
     clusterOutput:
       label: Cluster Output
@@ -1009,19 +1577,44 @@ harvester:
         suffix: 'for configs to take effect.'
 
   snapshot:
+=======
+      label: Cluster Flows
+    clusterOutput:
+      label: Cluster Outputs
+    flow:
+      label: Flows
+    output:
+      label: Outputs
+    diabledTips:
+        prefix: 'Enable'
+        middle: 'logging'
+        suffix: 'for configuration to take effect.'
+
+  snapshot:
+    totalSnapshotSize: Total Snapshot Size
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     label: Volume Snapshots
     targetVolume: Original Volume
     size: Size
     image: Image
 
   vmSnapshot:
+<<<<<<< HEAD
     label: VM Snapshots
+=======
+    label: Virtual Machine Snapshots
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     createText: Restore Snapshot
     snapshot: Snapshot
 
   storage:
     label: Storage
     useDefault: Use the default storage
+<<<<<<< HEAD
+=======
+    volumeEncryption: Volume Encryption
+    secret: Secret
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     migratable:
       label: Migratable
     numberOfReplicas:
@@ -1034,10 +1627,25 @@ harvester:
       label: Disk Selector
     storageClass:
       label: Storage Class
+<<<<<<< HEAD
     title: Storage Classes
     customize:
       volumeBindingMode:
         later: Bind and provision a persistent volume once a VM using the PersistentVolumeClaim is created
+=======
+      longhorn:
+        v1:
+          label: Longhorn V1 (CSI)
+        v2:
+          label: Longhorn V2 (CSI)
+        versionTooltip: Longhorn V2 is disabled for this node.
+      lvm:
+        label: LVM
+    title: Storage Classes
+    customize:
+      volumeBindingMode:
+        later: Bind and provision a persistent volume once a virtual machine using the PersistentVolumeClaim is created
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     parameters:
       numberOfReplicas:
         label: Number Of Replicas
@@ -1051,6 +1659,7 @@ harvester:
         no-options: No available tags, please add in the `Host > Storage` page
       migratable:
         label: Migratable
+<<<<<<< HEAD
     allowedTopologies:
       title: Allowed Topologies
       tooltip: Allowed Topologies helps scheduling VMs on hosts which match all of below expressions.
@@ -1058,6 +1667,22 @@ harvester:
   vlanConfig:
     title: Network Configs
     createNetworkConfig: Create Network Config
+=======
+      lvmVolumeGroupType:
+        label: Volume Group Type
+      lvmVolumeGroup:
+        label: Volume Group Name
+        no-options: No available Volume Groups, please add in the `Host > Storage` page
+      node:
+        label: Node
+    allowedTopologies:
+      title: Allowed Topologies
+      tooltip: Allowed Topologies helps scheduling virtual machines on hosts which match all of below expressions.
+
+  vlanConfig:
+    title: Network Configuration
+    createNetworkConfig: Create Network Configuration
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     action:
       migrate: Migrate
     titles:
@@ -1079,14 +1704,22 @@ harvester:
         validate:
           available: NIC "{nic}" is not available on the selected nodes
       linkAttributes:
+<<<<<<< HEAD
         mtu: 
+=======
+        mtu:
+>>>>>>> b5455bcb (fix: separate used/allocated units)
           label: MTU
       bondOptions:
         mode:
           label: Mode
         miimon:
           label: Miimon
+<<<<<<< HEAD
           tooltip: <Code>-1</Code> means to keep the original value
+=======
+          tooltip: Miimon specifies the MII link monitoring frequency in milliseconds. <Code>-1</Code> means to keep the original value.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     nodeSelector:
       matchingNodes:
         matchesSome: |-
@@ -1098,6 +1731,7 @@ harvester:
 
   vlanStatus:
     vlanConfig:
+<<<<<<< HEAD
       label: Network Config
   
   clusterNetwork:
@@ -1125,12 +1759,46 @@ harvester:
       'rancher-vcluster': rancher-vcluster deploys a vcluster with rancher installed.
       'harvester-seeder': harvester-seeder is an addon that uses ipmi and redfish to discover hardware information and perform out-of-band operations.
       'harvester-system/harvester-seeder': harvester-seeder is an addon that uses ipmi and redfish to discover hardware information and perform out-of-band operations.
+=======
+      label: Network Configuration
+
+  clusterNetwork:
+    title: Cluster Network Configuration
+    create:
+      button:
+        label: Create a Cluster Network
+    clusterNetwork: There are no network configurations defined.
+    mgmt: mgmt is a built-in cluster management network and does not support any additional network configurations.
+    notExist: 'Cluster Network "{ clusterNetwork }" does not exist'
+    notReady: 'Cluster Network "{ clusterNetwork }" is not ready'
+
+  addons:
+    descriptions:
+      'harvester-system/vm-import-controller': vm-import-controller is an add-on to help migrate virtual machine workloads from other source clusters to an existing Harvester cluster.
+      'harvester-system/pcidevices-controller': pcidevices-controller is an add-on to help discover PCI devices for nodes in your cluster and allow users to prepare devices for PCI Passthrough, for use with Harvester virtual machine and guest clusters.
+      'cattle-logging-system/rancher-logging': rancher-logging is an add-on to collect versatile logs, events, and audits from the Harvester cluster and route them to many kinds of servers based on flows.
+      'harvester-system/rancher-vcluster': rancher-vcluster deploys a virtual cluster (vcluster) with Rancher installed.
+      'cattle-monitoring-system/rancher-monitoring': rancher-monitoring is an add-on that collects Harvester cluster and virtual machine metrics and allows you to view the metrics on an embedded dashboard and send alert(s) to remote servers.
+      'vm-import-controller': vm-import-controller is an add-on to help migrate virtual machine workloads from other source clusters to an existing Harvester cluster.
+      'pcidevices-controller': pcidevices-controller is an add-on to help discover PCI devices for nodes in your cluster and allow users to prepare devices for PCI Passthrough, for use with Harvester virtual machines and guest clusters.
+      'nvidia-driver-toolkit': 'nvidia-driver-toolkit is an add-on to enable vGPU devices and assign them to Harvester virtual machines.'
+      'rancher-logging': rancher-logging is an add-on to collect versatile logs, events, and audits from the Harvester cluster and route them to many kinds of servers based on flows.
+      'rancher-monitoring': rancher-monitoring is an add-on to collect Harvester cluster and virtual machine metrics, view them on the embedded dashboard, and send alert(s) to remote servers.
+      'rancher-vcluster': rancher-vcluster deploys a virtual cluster (vcluster) with Rancher installed.
+      'harvester-seeder': harvester-seeder is an add-on that uses IPMI and Redfish to discover hardware information and perform out-of-band operations.
+      'harvester-system/harvester-seeder': harvester-seeder is an add-on that uses IPMI and Redfish to discover hardware information and perform out-of-band operations.
+      'harvester-csi-driver-lvm': harvester-csi-driver-lvm is an add-on allowing users to create PVC through the LVM with local devices.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     vmImport:
       titles:
         basic: Basic
         pvc: Volume
     rancherVcluster:
+<<<<<<< HEAD
       accessRancher: Access Rancher Dashboard
+=======
+      accessRancher: Access the Rancher Dashboard
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       hostname: Hostname
       rancherVersion: Rancher Version
       password: Bootstrap Password
@@ -1147,6 +1815,12 @@ harvester:
         location: Driver Location
       parsingSpecError:
         The field 'spec.valuesContent' has invalid format.
+<<<<<<< HEAD
+=======
+    usbController:
+      titles:
+        basic: Basic
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
   loadBalancer:
     label: Load Balancers
@@ -1191,12 +1865,20 @@ harvester:
       label: Backend Servers
     healthCheck:
       warning:
+<<<<<<< HEAD
         portInUse: Warning, Backend Port {port} is in use in Health Check settings; in case of updating the port, update the Health Check settings accordingly.
+=======
+        portInUse: Warning, the Backend Port {port} is in use in Health Check settings. If you need to update the port, update the Health Check settings accordingly.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
   ipPool:
     label: IP Pools
     network:
+<<<<<<< HEAD
       label: VM Network
+=======
+      label: Virtual Machine Network
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     tabs:
       range: Range
       scope: Scope
@@ -1226,13 +1908,21 @@ harvester:
       addLabel: Add CIDR
     range:
       addLabel: Add Range
+<<<<<<< HEAD
       
+=======
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   service:
     healthCheckPort:
       label: Health Check Port
     healthCheckSuccessThreshold:
       label: Health Check Success Threshold
+<<<<<<< HEAD
       description: If the number of times the prober continuously detects an address successfully reaches the success threshold, then the backend server can start to forward traffic.
+=======
+      description: If the number of times the probe continuously detects an address successfully reaches the success threshold, then the backend server can start to forward traffic.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     healthCheckFailureThreshold:
       label: Health Check Failure Threshold
       description: The backend server will stop forwarding traffic if the number of health check failures reaches the failure threshold.
@@ -1257,22 +1947,38 @@ harvester:
   sriovgpu:
     label: SR-IOV GPU Devices
     nodeName: Node
+<<<<<<< HEAD
     numVFs: Number Of Virtual Functions
+=======
+    numVFs: Number of Virtual Functions
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     vfAddresses: Virtual Functions Addresses
     vGpuDevices: vGPU Devices
     showMore: Show More
     parentSriov: Filter By Parent SR-IOV GPU
+<<<<<<< HEAD
     noPermission: Please contact system admin to add Harvester addons first
     goSetting:
       prefix: The nvidia-driver-toolkit addon is not enabled, click
+=======
+    noPermission: Please contact your system administrator to add Harvester add-ons first.
+    goSetting:
+      prefix: The nvidia-driver-toolkit add-on is not enabled, click
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       middle: here
       suffix: to enable it to manage your SR-IOV GPU devices.
 
   vgpu:
     label: vGPU Devices
+<<<<<<< HEAD
     noPermission: Please contact system admin to add Harvester addons first
     goSetting:
       prefix: The nvidia-driver-toolkit addon is not enabled, click
+=======
+    noPermission: Please contact system administrator to add Harvester add-ons first.
+    goSetting:
+      prefix: The nvidia-driver-toolkit add-on is not enabled, click
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       middle: here
       suffix: to enable it to manage your vGPU devices.
     enableGroup: Enable Group
@@ -1283,22 +1989,59 @@ harvester:
     available: Available Devices
     compatibleNodes: Compatible Nodes
     impossibleSelection: 'There are no hosts with all of the selected devices.'
+<<<<<<< HEAD
     howToUseDevice: 'Use the table below to enable vGPU devices you want to use in this VM.'
     deviceInTheSameHost: 'You can only select devices on the same host.'
 
   harvesterVlanConfigMigrateDialog:
     targetClusterNetwork: 
+=======
+    howToUseDevice: 'Use the table below to enable vGPU devices you want to use in this virtual machine.'
+    deviceInTheSameHost: 'You can only select devices on the same host.'
+
+  usb:
+    label: USB Devices
+    noPermission: Please contact system admin to add Harvester add-ons first
+    goSetting:
+      prefix: The pcidevices-controller add-on is not enabled, click
+      middle: here
+      suffix: to enable it to manage your USB devices.
+    enableGroup: Enable Group
+    disableGroup: Disable Group
+    available: Available USB Devices
+    compatibleNodes: Compatible Nodes
+    impossibleSelection: 'There are no hosts with all of the selected devices.'
+    howToUseDevice: 'Use the table below to enable USB passthrough on each device you want to use in this VM.'
+    deviceInTheSameHost: 'You can only select devices on the same host.'
+    showCompatibility: Show device compatibility matrix
+    hideCompatibility: Hide device compatibility matrix
+    claimError: Error enabling passthrough on {name}
+    unclaimError: Error disabling passthrough on {name}
+    cantUnclaim: You cannot disable passthrough on a device claimed by another user.
+    enablePassthroughWarning: 'Please re-enable the USB device if the device path changes in the following situations:<br/>&nbsp1) Re-plugging the USB device.<br/>&nbsp2) Rebooting the node.<br/><br/>An incorrect device path may cause passthrough to fail.'
+
+  harvesterVlanConfigMigrateDialog:
+    targetClusterNetwork:
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       label: Target Cluster Network
       placeholder: Choose Target Cluster Network
 
   seeder:
     banner:
       enable:
+<<<<<<< HEAD
         prefix: Addon "harvester-seeder" is disabled now, 
         middle: click here 
         suffix: to enable it.
       noAccess: Please contact system admin to enable the Out-of-Band Access first.
       noAddon: Addon "harvester-seeder" is not exist, please check if it is installed.
+=======
+        prefix: The "harvester-seeder" add-on is disabled.
+        middle: Click here
+        suffix: to enable it.
+      noAccess: Please contact your system administrator to enable the Out-of-Band Access first.
+      noAddon: The "harvester-seeder" add-on does not exist, please check if it is installed.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       noInventory: Waiting for "inventories.metal.harvesterhci.io" to be ready.
     inventory:
       host:
@@ -1319,10 +2062,17 @@ harvester:
         label: Polling Interval
 
   affinity:
+<<<<<<< HEAD
     thisPodNamespace: This VM's namespace
     matchExpressions:
       inNamespaces: "Workloads in these namespaces"
     vmAffinityTitle: VM Scheduling
+=======
+    thisPodNamespace: This virtual machine's namespace
+    matchExpressions:
+      inNamespaces: "Workloads in these namespaces"
+    vmAffinityTitle: Virtual Machine Scheduling
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     namespaces:
       placeholder: e.g. default,system,base
       label: Namespaces
@@ -1331,6 +2081,7 @@ harvester:
       placeholder: 'topology.kubernetes.io/zone'
 
 advancedSettings:
+<<<<<<< HEAD
   descriptions:
     'harv-vlan': Default Network Interface name of the VLAN network.
     'harv-backup-target': Custom backup target to store VM backups.
@@ -1362,6 +2113,42 @@ advancedSettings:
     'harv-ntp-servers': Configure NTP server. You can configure multiple IPv4 addresses or host addresses.
     'harv-auto-rotate-rke2-certs': The certificate rotation mechanism relies on Rancher. Harvester will automatically update certificates generation to trigger rotation.
     'harv-kubeconfig-default-token-ttl-minutes': 'TTL (in minutes) applied on Harvester admin kubeconfig files. Default is 0, which means to never expire.'
+=======
+  experimental: 'Experimental features allow users to test and evaluate early-access functionality prior to official supported releases'
+  descriptions:
+    'harv-vlan': Default Network Interface name of the VLAN network.
+    'harv-backup-target': Custom backup target to store virtual machine backups.
+    'branding': Branding allows administrators to globally re-brand the UI by customizing the Harvester product name, logos, and color scheme.
+    'harv-csi-driver-config': Configure additional information for CSI drivers.
+    'harv-containerd-registry': Containerd Registry Configuration to connect private registries.
+    'harv-log-level': Configure Harvester server log level. Defaults to Info.
+    'harv-server-version': Harvester server version.
+    'harv-upgrade-checker-enabled': Specifies whether to enable Harvester upgrade check or not. Default is True.
+    'harv-upgrade-checker-url': Default Harvester upgrade check url. Only used when the <code>upgrade-checker-enabled</code> is equal to True.
+    'harv-ui-source': Configure how to load the UI source.
+    'harv-ui-index': 'HTML index location for the UI.'
+    'harv-ui-plugin-index': 'JS index location for the Harvester plugin UI.'
+    'harv-cluster-registration-url': Registration URL for multi-cluster management.
+    'harv-http-proxy': 'HTTP proxy for Harvester to access external services.'
+    'harv-additional-ca': 'Custom CA root certificates for TLS validation.'
+    'harv-overcommit-config': 'Resource overcommit configuration.'
+    'harv-support-bundle-timeout': 'Support bundle timeout configuration in minutes, use 0 to disable the timeout.'
+    'harv-support-bundle-expiration': 'Support bundle expiration configuration in minutes.'
+    'harv-support-bundle-node-collection-timeout': 'Support bundle node collection timeout configuration in minutes.'
+    'harv-vm-force-reset-policy': Configuration for the force-reset action when a virtual machine is stuck on a node that is down.
+    'harv-ssl-parameters': Custom SSL Parameters for TLS validation.
+    'harv-storage-network': 'Longhorn storage-network setting.'
+    'harv-support-bundle-namespaces': Specify resources in other namespaces to be collected by the support package.
+    'harv-auto-disk-provision-paths': Specify the disks(using glob pattern) that Harvester will automatically add as virtual machine storage.
+    'harv-support-bundle-image': Support bundle image configuration. Find different versions in <a href="https://hub.docker.com/r/rancher/support-bundle-kit/tags" target="_blank">rancher/support-bundle-kit</a>.
+    'harv-release-download-url': This setting allows you to configure the <code>upgrade release download</code> URL address. Harvester will get the ISO URL and checksum value from the (<code>$URL</code>/<code>$VERSION</code>/version.yaml) file hosted by the configured URL.
+    'harv-default-vm-termination-grace-period-seconds': Configure the virtual machine termination grace period for virtual machine stop.
+    'harv-ntp-servers': Configure NTP server. You can configure multiple IPv4 addresses or host addresses.
+    'harv-auto-rotate-rke2-certs': The certificate rotation mechanism relies on Rancher. Harvester will automatically update certificates generation to trigger rotation.
+    'harv-kubeconfig-default-token-ttl-minutes': 'TTL (in minutes) applied on Harvester administration kubeconfig files. Default is 0, which means to never expire.'
+    'harv-longhorn-v2-data-engine-enabled': 'Enable the Longhorn V2 data engine. Default is false. <ul><li>Changing this setting will restart RKE2 on all nodes. This will not affect running VM workloads.</li><li>If you see "not enough hugepages-2Mi capacity" errors when enabling this setting, wait a minute for the error to clear. If the error remains, reboot the affected node.</li></ul>'
+    'harv-additional-guest-memory-overhead-ratio': 'The ratio for kubevirt to adjust the VM overhead memory. The value could be zero, empty value or floating number between 1.0 and 10.0, default to 1.5.'
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 typeLabel:
   kubevirt.io.virtualmachine: |-
@@ -1386,8 +2173,13 @@ typeLabel:
     }
   harvesterhci.io.networkattachmentdefinition: |-
     {count, plural,
+<<<<<<< HEAD
       one { VM Network }
       other { VM Networks }
+=======
+      one { Virtual Machine Network }
+      other { Virtual Machine Networks }
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     }
   harvesterhci.io.volume: |-
     {count, plural,
@@ -1409,6 +2201,7 @@ typeLabel:
       one { Template }
       other { Templates }
     }
+<<<<<<< HEAD
   harvesterhci.io.virtualmachinebackup: |-
     {count, plural,
       one { VM Backup }
@@ -1418,6 +2211,22 @@ typeLabel:
     {count, plural,
       one { Cloud Config Template }
       other { Cloud Config Templates }
+=======
+  harvesterhci.io.schedulevmbackup: |-
+    {count, plural,
+      one { Virtual Machine Schedule }
+      other { Virtual Machine Schedules }
+    }
+  harvesterhci.io.virtualmachinebackup: |-
+    {count, plural,
+      one { Virtual Machine Backup }
+      other { Virtual Machine Backups }
+    }
+  harvesterhci.io.cloudtemplate: |-
+    {count, plural,
+      one { Cloud Configuration Template }
+      other { Cloud Configuration Templates }
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     }
   harvesterhci.io.volumesnapshot: |-
     {count, plural,
@@ -1426,6 +2235,7 @@ typeLabel:
     }
   harvesterhci.io.vmsnapshot: |-
     {count, plural,
+<<<<<<< HEAD
       one { VM Snapshot }
       other { VM Snapshots }
     }
@@ -1438,6 +2248,20 @@ typeLabel:
     {count, plural,
       one { Alertmanager Config }
       other { Alertmanager Configs }
+=======
+      one { Virtual Machine Snapshot }
+      other { Virtual Machine Snapshots }
+    }
+  network.harvesterhci.io.vlanconfig: |-
+    {count, plural,
+      one { Network Configuration }
+      other { Network Configurations }
+    }
+  harvesterhci.io.monitoring.alertmanagerconfig: |-
+    {count, plural,
+      one { Alertmanager Configuration }
+      other { Alertmanager Configurations }
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     }
   harvesterhci.io.logging.clusterflow: |-
     {count, plural,
@@ -1479,6 +2303,14 @@ typeLabel:
       one { Cluster Network }
       other { Cluster Networks }
     }
+<<<<<<< HEAD
+=======
+  harvesterhci.io.addon: |-
+    {count, plural,
+      one { Add-on }
+      other { Add-ons }
+    }
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   devices.harvesterhci.io.sriovnetworkdevice: |-
     {count, plural,
       one { SR-IOV Network Device }
diff --git a/pkg/harvester/list/devices.harvesterhci.io.sriovgpudevice.vue b/pkg/harvester/list/devices.harvesterhci.io.sriovgpudevice.vue
index 6157f868408..df0da7dd56d 100644
--- a/pkg/harvester/list/devices.harvesterhci.io.sriovgpudevice.vue
+++ b/pkg/harvester/list/devices.harvesterhci.io.sriovgpudevice.vue
@@ -27,8 +27,11 @@ export default {
 
     if (this.hasSchema) {
       try {
+<<<<<<< HEAD
         const inStore = this.$store.getters['currentProduct'].inStore;
 
+=======
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         const hash = await allHash({
           sriovgpus:   this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.SR_IOVGPU_DEVICE }),
           vGpuDevices: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.VGPU_DEVICE }),
diff --git a/pkg/harvester/list/devices.harvesterhci.io.usbdevice.vue b/pkg/harvester/list/devices.harvesterhci.io.usbdevice.vue
new file mode 100644
index 00000000000..d1d61e81d8d
--- /dev/null
+++ b/pkg/harvester/list/devices.harvesterhci.io.usbdevice.vue
@@ -0,0 +1,83 @@
+<script>
+import { HCI } from '../types';
+import { allHash } from '@shell/utils/promise';
+import Banner from '@components/Banner/Banner.vue';
+import Loading from '@shell/components/Loading';
+import MessageLink from '@shell/components/MessageLink';
+import { ADD_ONS } from '../config/harvester-map';
+import DeviceList from '../edit/kubevirt.io.virtualmachine/VirtualMachineUSBDevices/DeviceList';
+
+export default {
+  name: 'ListUsbDevicePage',
+
+  components: {
+    Banner,
+    DeviceList,
+    Loading,
+    MessageLink,
+  },
+
+  async fetch() {
+    const inStore = this.$store.getters['currentProduct'].inStore;
+
+    this.schema = this.$store.getters[`${ inStore }/schemaFor`](HCI.USB_DEVICE);
+    this.hasAddonSchema = this.$store.getters[`${ inStore }/schemaFor`](HCI.ADD_ONS);
+
+    if (this.hasSchema) {
+      try {
+        const hash = await allHash({
+          usbDevices: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.USB_DEVICE }),
+          addons:     this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.ADD_ONS }),
+        });
+
+        this.hasPCIAddon = hash.addons.find(addon => addon.name === ADD_ONS.PCI_DEVICE_CONTROLLER)?.spec?.enabled === true;
+      } catch (e) {}
+    }
+  },
+
+  data() {
+    return {
+      hasAddonSchema: false,
+      hasPCIAddon:    false,
+      schema:         null,
+      toPciAddon:     `${ HCI.ADD_ONS }/harvester-system/${ ADD_ONS.PCI_DEVICE_CONTROLLER }?mode=edit`,
+    };
+  },
+
+  computed: {
+    hasSchema() {
+      return !!this.schema;
+    },
+
+    devices() {
+      const inStore = this.$store.getters['currentProduct'].inStore;
+
+      return this.$store.getters[`${ inStore }/all`](HCI.USB_DEVICE) || [];
+    }
+  },
+
+  typeDisplay() {
+    return this.t('harvester.usb.label');
+  }
+};
+</script>
+
+<template>
+  <Loading v-if="$fetchState.pending" />
+  <div v-else-if="!hasAddonSchema">
+    <Banner color="warning">
+      {{ t('harvester.usb.noPermission') }}
+    </Banner>
+  </div>
+  <div v-else-if="!hasPCIAddon">
+    <Banner color="warning">
+      <MessageLink
+        :to="toPciAddon"
+        prefix-label="harvester.usb.goSetting.prefix"
+        middle-label="harvester.usb.goSetting.middle"
+        suffix-label="harvester.usb.goSetting.suffix"
+      />
+    </Banner>
+  </div>
+  <DeviceList v-else-if="hasSchema" :devices="devices" :schema="schema" />
+</template>
diff --git a/pkg/harvester/list/harvesterhci.io.host.vue b/pkg/harvester/list/harvesterhci.io.host.vue
index 2d992703cdc..448e4a1860d 100644
--- a/pkg/harvester/list/harvesterhci.io.host.vue
+++ b/pkg/harvester/list/harvesterhci.io.host.vue
@@ -6,6 +6,10 @@ import {
   CAPI, METRIC, NODE, SCHEMA, LONGHORN, POD
 } from '@shell/config/types';
 import { HCI } from '../types';
+<<<<<<< HEAD
+=======
+import { DOC_LINKS } from '../config/doc-links';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 import { allHash } from '@shell/utils/promise';
 import metricPoller from '@shell/mixins/metric-poller';
 
@@ -90,6 +94,11 @@ export default {
           search:    ['internalIp'],
           value:     'internalIp',
           formatter: 'CopyToClipboard',
+<<<<<<< HEAD
+=======
+          sort:      ['internalIp'],
+          align:     'center',
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         },
       ];
 
@@ -126,6 +135,20 @@ export default {
         out.splice(-1, 0, storageHeader);
       }
 
+<<<<<<< HEAD
+=======
+      out.push({
+        name:          'cpuManager',
+        labelKey:      'harvester.tableHeaders.cpuManager',
+        value:         'id',
+        formatter:     'HarvesterCPUPinning',
+        formatterOpts: { rows: this.rows },
+        width:         150,
+        align:         'center',
+
+      });
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       if (this.hasLonghornSchema) {
         out.push({
           name:      'diskState',
@@ -142,7 +165,11 @@ export default {
         name:  'console',
         label: ' ',
         align: 'right',
+<<<<<<< HEAD
         width: 65,
+=======
+        width: 80,
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       });
 
       return out;
@@ -150,6 +177,13 @@ export default {
 
     schema() {
       return schema;
+<<<<<<< HEAD
+=======
+    },
+
+    consoleDocLink() {
+      return DOC_LINKS.CONSOLE_URL;
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     }
   },
   methods: {
@@ -168,7 +202,19 @@ export default {
 
     goto(row) {
       window.open(row.consoleUrl, '_blank');
+<<<<<<< HEAD
     }
+=======
+    },
+
+    consoleTooltip(row) {
+      if (!row.consoleUrl) {
+        return this.t('harvester.host.noConsoleUrl');
+      }
+
+      return '';
+    },
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   },
 
   typeDisplay() {
@@ -198,10 +244,28 @@ export default {
       v-on="$listeners"
     >
       <template #cell:console="{row}">
+<<<<<<< HEAD
         <button type="button" class="btn btn-sm role-primary" :disabled="!row.consoleUrl" @click="goto(row)">
           {{ t('harvester.host.console') }}
         </button>
+=======
+        <div class="console-button">
+          <button v-clean-tooltip="consoleTooltip(row)" type="button" class="mr-5 btn btn-sm role-primary" :disabled="!row.consoleUrl" @click="goto(row)">
+            {{ t('harvester.host.console') }}
+          </button>
+          <a v-if="!row.consoleUrl" :href="consoleDocLink" target="_blank"><i class="icon icon-info" /></a>
+        </div>
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       </template>
     </ResourceTable>
   </div>
 </template>
+<<<<<<< HEAD
+=======
+
+<style lang="scss" scoped>
+  .console-button {
+    display: flex;
+  }
+</style>
+>>>>>>> b5455bcb (fix: separate used/allocated units)
diff --git a/pkg/harvester/list/harvesterhci.io.schedulevmbackup.vue b/pkg/harvester/list/harvesterhci.io.schedulevmbackup.vue
new file mode 100644
index 00000000000..a875b317099
--- /dev/null
+++ b/pkg/harvester/list/harvesterhci.io.schedulevmbackup.vue
@@ -0,0 +1,124 @@
+<script>
+import Loading from '@shell/components/Loading';
+import Masthead from '@shell/components/ResourceList/Masthead';
+import ResourceTable from '@shell/components/ResourceTable';
+import { HCI } from '../types';
+import { allSettled } from '../utils/promise';
+import { STATE, AGE, NAME, NAMESPACE } from '@shell/config/table-headers';
+import { VM_SCHEDULE_CRON, VM_SCHEDULE_RETAIN, VM_SCHEDULE_TYPE, VM_SCHEDULE_MAX_FAILURE } from '../config/table-headers';
+import { BACKUP_TYPE } from '../config/types';
+
+export default {
+  name:       'HarvesterListSchedule',
+  components: {
+    ResourceTable, Loading, Masthead,
+  },
+
+  props: {
+    schema: {
+      type:     Object,
+      required: true,
+    }
+  },
+
+  async fetch() {
+    const inStore = this.$store.getters['currentProduct'].inStore;
+    const hash = await allSettled({
+      vms:  this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.VM }),
+      rows: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.SCHEDULE_VM_BACKUP }),
+    });
+
+    this.rows = hash.rows;
+  },
+
+  data() {
+    const params = { ...this.$route.params };
+    const resource = params.resource;
+
+    return {
+      rows:     [],
+      settings: [],
+      resource,
+      to:       `${ HCI.SETTING }/backup-target?mode=edit`,
+    };
+  },
+
+  computed: {
+    headers() {
+      const cols = [
+        STATE,
+        NAME,
+        NAMESPACE,
+        {
+          name:      'sourceVm',
+          labelKey:  'harvester.tableHeaders.sourceVm',
+          value:     'spec.vmbackup.source.name',
+          sort:      'sourceVm',
+          align:     'center',
+          formatter: 'AttachVMWithName'
+        },
+        VM_SCHEDULE_TYPE,
+        VM_SCHEDULE_CRON,
+        VM_SCHEDULE_RETAIN,
+        VM_SCHEDULE_MAX_FAILURE,
+        AGE,
+      ];
+
+      return cols;
+    },
+
+    filteredRows() {
+      return this.rows.filter(R => R.spec?.type !== BACKUP_TYPE.SNAPSHOT);
+    },
+
+    typeDisplay() {
+      return this.t('harvester.schedule.label');
+    }
+  },
+
+  methods: {
+    getRow(row) {
+      return row.spec?.vmbackup?.source?.name;
+    }
+  },
+};
+</script>
+
+<template>
+  <Loading v-if="$fetchState.pending" />
+  <div v-else>
+    <Masthead
+      :schema="schema"
+      :resource="resource"
+      :type-display="typeDisplay"
+      :parentNameOverride="'Virtual Machine schedule'"
+      :create-button-label="t('harvester.schedule.createButtonText')"
+    />
+    <ResourceTable
+      v-bind="$attrs"
+      :headers="headers"
+      :groupable="true"
+      :rows="filteredRows"
+      :schema="schema"
+      key-field="_key"
+      default-sort-by="age"
+      v-on="$listeners"
+    >
+      <template #col:name="{row}">
+        <td>
+          <span>
+            <n-link
+              v-if="getRow(row)"
+              :to="row.detailLocation"
+            >
+              {{ row.nameDisplay }}
+            </n-link>
+            <span v-else>
+              {{ row.nameDisplay }}
+            </span>
+          </span>
+        </td>
+      </template>
+    </ResourceTable>
+  </div>
+</template>
diff --git a/pkg/harvester/list/harvesterhci.io.setting.vue b/pkg/harvester/list/harvesterhci.io.setting.vue
index d5ab7fcfa4e..ccf71b70978 100644
--- a/pkg/harvester/list/harvesterhci.io.setting.vue
+++ b/pkg/harvester/list/harvesterhci.io.setting.vue
@@ -138,7 +138,11 @@ export default {
   <div v-else>
     <Banner color="warning" class="settings-banner">
       <div>
+<<<<<<< HEAD
         {{ t('advancedSettings.subtext') }}
+=======
+        {{ t('harvester.setting.modifiedMessage') }}
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       </div>
     </Banner>
 
diff --git a/pkg/harvester/list/harvesterhci.io.virtualmachinebackup.vue b/pkg/harvester/list/harvesterhci.io.virtualmachinebackup.vue
index d563a3252f0..8dcc4c0f178 100644
--- a/pkg/harvester/list/harvesterhci.io.virtualmachinebackup.vue
+++ b/pkg/harvester/list/harvesterhci.io.virtualmachinebackup.vue
@@ -4,28 +4,45 @@ import Loading from '@shell/components/Loading';
 import MessageLink from '@shell/components/MessageLink';
 import Masthead from '@shell/components/ResourceList/Masthead';
 import ResourceTable from '@shell/components/ResourceTable';
+<<<<<<< HEAD
 
+=======
+import FilterVMSchedule from '../components/FilterVMSchedule';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 import { HCI } from '../types';
 import { allSettled } from '../utils/promise';
 import { STATE, AGE, NAME, NAMESPACE } from '@shell/config/table-headers';
 import { BACKUP_TYPE } from '../config/types';
+<<<<<<< HEAD
+=======
+import { defaultTableSortGenerationFn } from '@shell/components/ResourceTable.vue';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 export default {
   name:       'HarvesterListBackup',
   components: {
+<<<<<<< HEAD
     ResourceTable, Banner, Loading, Masthead, MessageLink
+=======
+    ResourceTable, Banner, Loading, Masthead, MessageLink, FilterVMSchedule
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   },
 
   props: {
     schema: {
       type:     Object,
       required: true,
+<<<<<<< HEAD
     }
+=======
+    },
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   },
 
   async fetch() {
     const inStore = this.$store.getters['currentProduct'].inStore;
     const hash = await allSettled({
+<<<<<<< HEAD
       vms:      this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.VM }),
       settings: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.SETTING }),
       rows:     this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.BACKUP }),
@@ -34,6 +51,17 @@ export default {
     this.rows = hash.rows;
     this.settings = hash.settings;
 
+=======
+      vms:          this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.VM }),
+      settings:     this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.SETTING }),
+      backups:      this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.BACKUP }),
+      scheduleList: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.SCHEDULE_VM_BACKUP }),
+    });
+
+    this.backups = hash.backups;
+    this.rows = hash.backups;
+    this.settings = hash.settings;
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     if (this.$store.getters[`${ inStore }/schemaFor`](HCI.SETTING)) {
       const backupTargetResource = hash.settings.find( O => O.id === 'backup-target');
       const isEmpty = this.getBackupTargetValueIsEmpty(backupTargetResource);
@@ -50,10 +78,19 @@ export default {
     const resource = params.resource;
 
     return {
+<<<<<<< HEAD
       rows:     [],
       settings: [],
       resource,
       to:       `${ HCI.SETTING }/backup-target?mode=edit`,
+=======
+      rows:           [],
+      backups:        [],
+      settings:       [],
+      resource,
+      to:             `${ HCI.SETTING }/backup-target?mode=edit`,
+      searchSchedule: ''
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     };
   },
 
@@ -85,7 +122,29 @@ export default {
       }
 
       return out;
+<<<<<<< HEAD
     }
+=======
+    },
+
+    getRow(row) {
+      return row.status && row.status.source;
+    },
+
+    changeRows(filteredRows, searchSchedule) {
+      this.$set(this, 'searchSchedule', searchSchedule);
+      this.$set(this, 'backups', filteredRows);
+    },
+
+    sortGenerationFn() {
+      let base = defaultTableSortGenerationFn(this.schema, this.$store);
+
+      base += this.searchSchedule;
+
+      return base;
+    },
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   },
 
   computed: {
@@ -96,12 +155,25 @@ export default {
         NAMESPACE,
         {
           name:      'targetVM',
+<<<<<<< HEAD
           labelKey:  'tableHeaders.targetVm',
+=======
+          labelKey:  'harvester.tableHeaders.targetVm',
+>>>>>>> b5455bcb (fix: separate used/allocated units)
           value:     'attachVM',
           align:     'left',
           formatter: 'AttachVMWithName'
         },
         {
+<<<<<<< HEAD
+=======
+          name:      'backupCreatedFrom',
+          labelKey:  'harvester.tableHeaders.vmSchedule',
+          value:     'sourceSchedule',
+          formatter: 'BackupCreatedFrom',
+        },
+        {
+>>>>>>> b5455bcb (fix: separate used/allocated units)
           name:      'backupTarget',
           labelKey:  'tableHeaders.backupTarget',
           value:     'backupTarget',
@@ -112,7 +184,11 @@ export default {
           name:      'readyToUse',
           labelKey:  'tableHeaders.readyToUse',
           value:     'status.readyToUse',
+<<<<<<< HEAD
           align:     'left',
+=======
+          align:     'center',
+>>>>>>> b5455bcb (fix: separate used/allocated units)
           formatter: 'Checked',
         },
       ];
@@ -124,16 +200,22 @@ export default {
           value:     'backupProgress',
           align:     'left',
           formatter: 'HarvesterBackupProgressBar',
+<<<<<<< HEAD
           width:     200,
         });
       }
 
+=======
+        });
+      }
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       cols.push(AGE);
 
       return cols;
     },
 
     hasBackupProgresses() {
+<<<<<<< HEAD
       return !!this.rows.find(R => R.status?.progress !== undefined);
     },
 
@@ -143,6 +225,18 @@ export default {
 
     backupTargetResource() {
       return this.settings.find( O => O.id === 'backup-target');
+=======
+      return !!this.backups.find(r => r.status?.progress !== undefined);
+    },
+    filteredRows() {
+      return this.backups.filter(r => r.spec?.type !== BACKUP_TYPE.SNAPSHOT);
+    },
+    getRawRows() {
+      return this.rows.filter(r => r.spec?.type === BACKUP_TYPE.BACKUP);
+    },
+    backupTargetResource() {
+      return this.settings.find(O => O.id === 'backup-target');
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     },
 
     isEmptyValue() {
@@ -211,16 +305,33 @@ export default {
       :headers="headers"
       :groupable="true"
       :rows="filteredRows"
+<<<<<<< HEAD
+=======
+      :sort-generation-fn="sortGenerationFn"
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       :schema="schema"
       key-field="_key"
       default-sort-by="age"
       v-on="$listeners"
     >
+<<<<<<< HEAD
+=======
+      <template #more-header-middle>
+        <FilterVMSchedule
+          :rows="getRawRows"
+          @change-rows="changeRows"
+        />
+      </template>
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       <template #col:name="{row}">
         <td>
           <span>
             <n-link
+<<<<<<< HEAD
               v-if="row.status && row.status.source"
+=======
+              v-if="getRow(row)"
+>>>>>>> b5455bcb (fix: separate used/allocated units)
               :to="row.detailLocation"
             >
               {{ row.nameDisplay }}
diff --git a/pkg/harvester/list/harvesterhci.io.virtualmachineimage.vue b/pkg/harvester/list/harvesterhci.io.virtualmachineimage.vue
index 13dad01f333..5d122dbad8b 100644
--- a/pkg/harvester/list/harvesterhci.io.virtualmachineimage.vue
+++ b/pkg/harvester/list/harvesterhci.io.virtualmachineimage.vue
@@ -75,6 +75,25 @@ export default {
       <template #more-header-middle>
         <FilterLabel ref="filterLabel" :rows="rows" @changeRows="changeRows" />
       </template>
+<<<<<<< HEAD
+=======
+      <template #col:name="{row}">
+        <td>
+          <span>
+            <n-link
+              v-if="row?.detailLocation"
+              :to="row.detailLocation"
+            >
+              {{ row.nameDisplay }}
+              <i v-if="row.isEncrypted" class="icon icon-lock" />
+            </n-link>
+            <span v-else>
+              {{ row.nameDisplay }}
+            </span>
+          </span>
+        </td>
+      </template>
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     </ResourceTable>
   </div>
 </template>
diff --git a/pkg/harvester/list/harvesterhci.io.vmsnapshot.vue b/pkg/harvester/list/harvesterhci.io.vmsnapshot.vue
index ed94a79ff4d..24978a2031f 100644
--- a/pkg/harvester/list/harvesterhci.io.vmsnapshot.vue
+++ b/pkg/harvester/list/harvesterhci.io.vmsnapshot.vue
@@ -2,6 +2,7 @@
 import Loading from '@shell/components/Loading';
 import Masthead from '@shell/components/ResourceList/Masthead';
 import ResourceTable from '@shell/components/ResourceTable';
+<<<<<<< HEAD
 
 import { HCI } from '../types';
 import { SCHEMA } from '@shell/config/types';
@@ -10,6 +11,17 @@ import { STATE, AGE, NAME, NAMESPACE } from '@shell/config/table-headers';
 import { BACKUP_TYPE } from '../config/types';
 
 const schema = {
+=======
+import { HCI } from '../types';
+import { SCHEMA } from '@shell/config/types';
+import { allHash } from '@shell/utils/promise';
+import FilterVMSchedule from '../components/FilterVMSchedule';
+import { STATE, AGE, NAME, NAMESPACE } from '@shell/config/table-headers';
+import { BACKUP_TYPE } from '../config/types';
+import { defaultTableSortGenerationFn } from '@shell/components/ResourceTable.vue';
+
+export const schema = {
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   id:         HCI.VM_SNAPSHOT,
   type:       SCHEMA,
   attributes: {
@@ -22,7 +34,11 @@ const schema = {
 export default {
   name:       'HarvesterListVMSnapshot',
   components: {
+<<<<<<< HEAD
     ResourceTable, Loading, Masthead
+=======
+    ResourceTable, Loading, Masthead, FilterVMSchedule
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   },
 
   async fetch() {
@@ -39,6 +55,10 @@ export default {
     }
 
     this.rows = hash.rows;
+<<<<<<< HEAD
+=======
+    this.snapshots = hash.rows;
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   },
 
   data() {
@@ -47,7 +67,13 @@ export default {
     const resource = params.resource;
 
     return {
+<<<<<<< HEAD
       rows: [],
+=======
+      rows:           [],
+      snapshots:      [],
+      searchSchedule: '',
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       resource,
     };
   },
@@ -60,6 +86,7 @@ export default {
         NAMESPACE,
         {
           name:      'targetVM',
+<<<<<<< HEAD
           labelKey:  'tableHeaders.targetVm',
           value:     'attachVM',
           align:     'left',
@@ -70,12 +97,40 @@ export default {
           labelKey:  'tableHeaders.readyToUse',
           value:     'status.readyToUse',
           align:     'left',
+=======
+          labelKey:  'harvester.tableHeaders.targetVm',
+          value:     'attachVM',
+          align:     'left',
+          sort:      'attachVM',
+          formatter: 'AttachVMWithName'
+        },
+        {
+          name:      'backupCreatedFrom',
+          labelKey:  'harvester.tableHeaders.vmSchedule',
+          value:     'sourceSchedule',
+          sort:      'sourceSchedule',
+          formatter: 'BackupCreatedFrom',
+        },
+        {
+          name:      'readyToUse',
+          labelKey:  'tableHeaders.readyToUse',
+          value:     'status.readyToUse',
+          align:     'center',
+          sort:      'status.readyToUse',
+>>>>>>> b5455bcb (fix: separate used/allocated units)
           formatter: 'Checked',
         },
         AGE
       ];
     },
 
+<<<<<<< HEAD
+=======
+    getRawRows() {
+      return this.rows.filter(r => r.spec?.type === BACKUP_TYPE.SNAPSHOT);
+    },
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     schema() {
       return schema;
     },
@@ -85,9 +140,30 @@ export default {
     },
 
     filteredRows() {
+<<<<<<< HEAD
       return this.rows.filter(R => R.spec?.type !== BACKUP_TYPE.BACKUP);
     },
   },
+=======
+      return this.snapshots.filter(r => r.spec?.type !== BACKUP_TYPE.BACKUP);
+    },
+  },
+
+  methods: {
+    changeRows(filteredRows, searchSchedule) {
+      this.$set(this, 'searchSchedule', searchSchedule);
+      this.$set(this, 'snapshots', filteredRows);
+    },
+
+    sortGenerationFn() {
+      let base = defaultTableSortGenerationFn(this.schema, this.$store);
+
+      base += this.searchSchedule;
+
+      return base;
+    },
+  }
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 };
 </script>
 
@@ -100,17 +176,33 @@ export default {
       :type-display="typeDisplay"
       :create-button-label="t('harvester.vmSnapshot.createText')"
     />
+<<<<<<< HEAD
 
+=======
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     <ResourceTable
       v-bind="$attrs"
       :headers="headers"
       :groupable="true"
       :rows="filteredRows"
       :schema="schema"
+<<<<<<< HEAD
+=======
+      :sort-generation-fn="sortGenerationFn"
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       key-field="_key"
       default-sort-by="age"
       v-on="$listeners"
     >
+<<<<<<< HEAD
+=======
+      <template #more-header-middle>
+        <FilterVMSchedule
+          :rows="getRawRows"
+          @change-rows="changeRows"
+        />
+      </template>
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       <template #col:name="{row}">
         <td>
           <span>
@@ -126,6 +218,10 @@ export default {
           </span>
         </td>
       </template>
+<<<<<<< HEAD
     </resourcetable>
+=======
+    </ResourceTable>
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   </div>
 </template>
diff --git a/pkg/harvester/list/harvesterhci.io.volume.vue b/pkg/harvester/list/harvesterhci.io.volume.vue
index d261af9ee87..1cbb8f2f3f7 100644
--- a/pkg/harvester/list/harvesterhci.io.volume.vue
+++ b/pkg/harvester/list/harvesterhci.io.volume.vue
@@ -4,7 +4,13 @@ import ResourceTable from '@shell/components/ResourceTable';
 import HarvesterVolumeState from '../formatters/HarvesterVolumeState';
 
 import { allSettled } from '../utils/promise';
+<<<<<<< HEAD
 import { PV, PVC, SCHEMA, LONGHORN } from '@shell/config/types';
+=======
+import {
+  PV, PVC, SCHEMA, LONGHORN, STORAGE_CLASS
+} from '@shell/config/types';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 import { HCI, VOLUME_SNAPSHOT } from '../types';
 import { STATE, AGE, NAME, NAMESPACE } from '@shell/config/table-headers';
 
@@ -30,6 +36,10 @@ export default {
       pvcs: this.$store.dispatch(`${ inStore }/findAll`, { type: PVC }),
       pvs:  this.$store.dispatch(`${ inStore }/findAll`, { type: PV }),
       vms:  this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.VM }),
+<<<<<<< HEAD
+=======
+      scs:  this.$store.dispatch(`${ inStore }/findAll`, { type: STORAGE_CLASS }),
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     };
 
     const volumeSnapshotSchema = this.$store.getters[`${ inStore }/schemaFor`](VOLUME_SNAPSHOT);
@@ -158,6 +168,25 @@ export default {
         </n-link>
       </div>
     </template>
+<<<<<<< HEAD
+=======
+    <template #col:name="{row}">
+      <td>
+        <span>
+          <n-link
+            v-if="row?.detailLocation"
+            :to="row.detailLocation"
+          >
+            {{ row.nameDisplay }}
+            <i v-if="row.isEncrypted" class="icon icon-lock" />
+          </n-link>
+          <span v-else>
+            {{ row.nameDisplay }}
+          </span>
+        </span>
+      </td>
+    </template>
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   </ResourceTable>
 </template>
 
diff --git a/pkg/harvester/list/kubevirt.io.virtualmachine.vue b/pkg/harvester/list/kubevirt.io.virtualmachine.vue
index 6cca3a5a8aa..622af5562ba 100644
--- a/pkg/harvester/list/kubevirt.io.virtualmachine.vue
+++ b/pkg/harvester/list/kubevirt.io.virtualmachine.vue
@@ -1,6 +1,7 @@
 <script>
 import ConsoleBar from '../components/VMConsoleBar';
 import ResourceTable from '@shell/components/ResourceTable';
+<<<<<<< HEAD
 import LinkDetail from '@shell/components/formatter/LinkDetail';
 import HarvesterVmState from '../formatters/HarvesterVmState';
 
@@ -8,6 +9,14 @@ import { STATE, AGE, NAME, NAMESPACE } from '@shell/config/table-headers';
 import { NODE, POD } from '@shell/config/types';
 import { HCI } from '../types';
 
+=======
+import HarvesterVmState from '../formatters/HarvesterVmState';
+import {
+  PVC, PV, NODE, POD, STORAGE_CLASS
+} from '@shell/config/types';
+import { STATE, AGE, NAME, NAMESPACE } from '@shell/config/table-headers';
+import { HCI } from '../types';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 import { allHash } from '@shell/utils/promise';
 import Loading from '@shell/components/Loading';
 import { clone } from '@shell/utils/object';
@@ -46,7 +55,12 @@ export const VM_HEADERS = [
     label:     'IP Address',
     value:     'id',
     formatter: 'HarvesterIpAddress',
+<<<<<<< HEAD
     labelKey:  'tableHeaders.ipAddress'
+=======
+    labelKey:  'tableHeaders.ipAddress',
+    sort:      ['id'],
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   },
   {
     ...AGE,
@@ -59,7 +73,10 @@ export default {
   components: {
     Loading,
     HarvesterVmState,
+<<<<<<< HEAD
     LinkDetail,
+=======
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     ConsoleBar,
     ResourceTable
   },
@@ -76,10 +93,25 @@ export default {
     const _hash = {
       vms:     this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.VM }),
       pod:     this.$store.dispatch(`${ inStore }/findAll`, { type: POD }),
+<<<<<<< HEAD
+      restore: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.RESTORE }),
+      backups: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.BACKUP }),
+    };
+
+=======
+      pvcs:    this.$store.dispatch(`${ inStore }/findAll`, { type: PVC }),
+      pvs:     this.$store.dispatch(`${ inStore }/findAll`, { type: PV }),
+      images:  this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.IMAGE }),
       restore: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.RESTORE }),
       backups: this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.BACKUP }),
+      storage: this.$store.dispatch(`${ inStore }/findAll`, { type: STORAGE_CLASS }),
     };
 
+    if (this.$store.getters[`${ inStore }/schemaFor`](HCI.RESOURCE_QUOTA)) {
+      _hash.resourceQuotas = this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.RESOURCE_QUOTA });
+    }
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     if (this.$store.getters[`${ inStore }/schemaFor`](NODE)) {
       _hash.nodes = this.$store.dispatch(`${ inStore }/findAll`, { type: NODE });
       this.hasNode = true;
@@ -164,6 +196,23 @@ export default {
     await this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.VMIM });
 
     this.$set(this, 'allVMIs', vmis);
+<<<<<<< HEAD
+=======
+  },
+
+  methods: {
+    lockIconTooltipMessage(row) {
+      const message = '';
+
+      if (row.encryptedVolumeType === 'all') {
+        return this.t('harvester.virtualMachine.volume.lockTooltip.all');
+      } else if (row.encryptedVolumeType === 'partial') {
+        return this.t('harvester.virtualMachine.volume.lockTooltip.partial');
+      }
+
+      return message;
+    }
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   }
 };
 </script>
@@ -189,11 +238,29 @@ export default {
 
       <template slot="cell:name" slot-scope="scope">
         <div class="name-console">
+<<<<<<< HEAD
           <LinkDetail v-if="scope.row.type !== HCI.VMI" v-model="scope.row.metadata.name" :row="scope.row" />
           <span v-else>
             {{ scope.row.metadata.name }}
           </span>
 
+=======
+          <n-link
+            v-if="scope.row.type !== HCI.VMI"
+            :to="scope.row.detailLocation"
+          >
+            {{ scope.row.metadata.name }}
+            <i
+              v-if="lockIconTooltipMessage(scope.row)"
+              v-tooltip="lockIconTooltipMessage(scope.row)"
+              class="icon icon-lock"
+              :class="{'green-icon': scope.row.encryptedVolumeType === 'all', 'yellow-icon': scope.row.encryptedVolumeType === 'partial'}"
+            />
+          </n-link>
+          <span v-else>
+            {{ scope.row.metadata.name }}
+          </span>
+>>>>>>> b5455bcb (fix: separate used/allocated units)
           <ConsoleBar :resource="scope.row" class="console mr-10 ml-10" />
         </div>
       </template>
@@ -210,6 +277,17 @@ export default {
   }
 }
 
+<<<<<<< HEAD
+=======
+.green-icon {
+  color: var(--success);
+}
+
+.yellow-icon {
+  color: var(--warning);
+}
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 .name-console {
   display: flex;
   align-items: center;
diff --git a/pkg/harvester/mixins/harvester-vm/impl.js b/pkg/harvester/mixins/harvester-vm/impl.js
index ebf67032cd3..da54fb1f154 100644
--- a/pkg/harvester/mixins/harvester-vm/impl.js
+++ b/pkg/harvester/mixins/harvester-vm/impl.js
@@ -144,6 +144,13 @@ export default {
       return !!spec?.template?.spec?.domain?.firmware?.bootloader?.efi?.secureBoot;
     },
 
+<<<<<<< HEAD
+=======
+    isCpuPinning(spec) {
+      return !!spec?.template?.spec?.domain?.cpu?.dedicatedCpuPlacement;
+    },
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     getCloudInitNoCloud(spec) {
       const secret = this.getSecret(spec);
       let userData = secret?.decodedData?.userdata;
diff --git a/pkg/harvester/mixins/harvester-vm/index.js b/pkg/harvester/mixins/harvester-vm/index.js
index cf6b4a0b55d..e2ecc1104fb 100644
--- a/pkg/harvester/mixins/harvester-vm/index.js
+++ b/pkg/harvester/mixins/harvester-vm/index.js
@@ -11,7 +11,13 @@ import { allHash } from '@shell/utils/promise';
 import { randomStr } from '@shell/utils/string';
 import { base64Decode } from '@shell/utils/crypto';
 import { formatSi, parseSi } from '@shell/utils/units';
+<<<<<<< HEAD
 import { ADD_ONS, SOURCE_TYPE, ACCESS_CREDENTIALS } from '../../config/harvester-map';
+=======
+import {
+  ADD_ONS, SOURCE_TYPE, ACCESS_CREDENTIALS, maintenanceStrategies, runStrategies
+} from '../../config/harvester-map';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 import { _CLONE, _CREATE, _VIEW } from '@shell/config/query-params';
 import {
   PV, PVC, STORAGE_CLASS, NODE, SECRET, CONFIG_MAP, NETWORK_ATTACHMENT, NAMESPACE, LONGHORN
@@ -24,6 +30,11 @@ import impl, { QGA_JSON, USB_TABLET } from './impl';
 import { uniq } from '@shell/utils/array';
 import { parseVolumeClaimTemplates } from '../../utils/vm';
 
+<<<<<<< HEAD
+=======
+const LONGHORN_V2_DATA_ENGINE = 'longhorn-system/v2-data-engine';
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 export const MANAGEMENT_NETWORK = 'management Network';
 
 export const OS = [{
@@ -49,6 +60,10 @@ export const OS = [{
   value: 'oracle'
 }, {
   label: 'Red Hat',
+<<<<<<< HEAD
+=======
+  match: ['redhat', 'rhel'],
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   value: 'redhat'
 }, {
   label: 'openSUSE',
@@ -97,6 +112,10 @@ export default {
       vms:               this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.VM }),
       secrets:           this.$store.dispatch(`${ inStore }/findAll`, { type: SECRET }),
       addons:            this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.ADD_ONS }),
+<<<<<<< HEAD
+=======
+      longhornV2Engine:  this.$store.dispatch(`${ inStore }/find`, { type: LONGHORN.SETTINGS, id: LONGHORN_V2_DATA_ENGINE }),
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     };
 
     if (this.$store.getters[`${ inStore }/schemaFor`](NODE)) {
@@ -120,11 +139,18 @@ export default {
     const hasPCISchema = !!this.$store.getters[`${ inStore }/schemaFor`](HCI.PCI_DEVICE);
     const hasSRIOVGPUSchema = !!this.$store.getters[`${ inStore }/schemaFor`](HCI.SR_IOVGPU_DEVICE);
 
+<<<<<<< HEAD
     const hasPCIAddon = res.addons.find(addon => addon.name === ADD_ONS.PCI_DEVICE_CONTROLLER)?.spec?.enabled === true;
     const hasSriovgpuAddon = res.addons.find(addon => addon.name === ADD_ONS.NVIDIA_DRIVER_TOOLKIT_CONTROLLER)?.spec?.enabled === true;
 
     this.enabledPCI = hasPCIAddon && hasPCISchema;
     this.enabledSriovgpu = hasSriovgpuAddon && hasPCIAddon && hasSRIOVGPUSchema;
+=======
+    const enabledAddons = res.addons.reduce((acc, addon) => ({ ...acc, [addon.name]: addon.spec?.enabled }), {});
+
+    this.enabledPCI = hasPCISchema && enabledAddons[ADD_ONS.PCI_DEVICE_CONTROLLER];
+    this.enabledSriovgpu = hasSRIOVGPUSchema && enabledAddons[ADD_ONS.PCI_DEVICE_CONTROLLER] && enabledAddons[ADD_ONS.NVIDIA_DRIVER_TOOLKIT_CONTROLLER];
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   },
 
   data() {
@@ -136,6 +162,12 @@ export default {
       spec:                          null,
       osType:                        'linux',
       sshKey:                        [],
+<<<<<<< HEAD
+=======
+      maintenanceStrategies,
+      maintenanceStrategy:           'Migrate',
+      runStrategies,
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       runStrategy:                   'RerunOnFailure',
       installAgent:                  true,
       hasCreateVolumes:              [],
@@ -164,6 +196,10 @@ export default {
       enabledSriovgpu:               false,
       immutableMode:                 this.realMode === _CREATE ? _CREATE : _VIEW,
       terminationGracePeriodSeconds: '',
+<<<<<<< HEAD
+=======
+      cpuPinning:                    false,
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     };
   },
 
@@ -235,7 +271,11 @@ export default {
     defaultStorageClass() {
       const defaultStorage = this.$store.getters[`${ this.inStore }/all`](STORAGE_CLASS).find( O => O.isDefault);
 
+<<<<<<< HEAD
       return defaultStorage?.metadata?.name || 'longhorn';
+=======
+      return defaultStorage;
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     },
 
     storageClassSetting() {
@@ -297,7 +337,11 @@ export default {
       } = config;
 
       const vm = this.resource === HCI.VM ? value : this.resource === HCI.BACKUP ? this.value.status?.source : value.spec.vm;
+<<<<<<< HEAD
 
+=======
+      const volumeBackups = this.resource === HCI.BACKUP ? this.value.status?.volumeBackups : null;
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       const spec = vm?.spec;
 
       if (!spec) {
@@ -316,6 +360,14 @@ export default {
         };
       }
 
+<<<<<<< HEAD
+=======
+      if (!vm.metadata.labels) {
+        vm.metadata.labels = {};
+      }
+      const maintenanceStrategy = vm.metadata.labels?.[HCI_ANNOTATIONS.VM_MAINTENANCE_MODE_STRATEGY] || 'Migrate';
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       const runStrategy = spec.runStrategy || 'RerunOnFailure';
       const machineType = value.machineType;
       const cpu = spec.template.spec.domain?.cpu?.cores;
@@ -326,7 +378,12 @@ export default {
       const sshKey = this.getSSHFromAnnotation(spec) || [];
 
       const imageId = this.getRootImageId(vm) || '';
+<<<<<<< HEAD
       const diskRows = this.getDiskRows(vm);
+=======
+      const diskRows = this.getDiskRows(vm, volumeBackups);
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       const networkRows = this.getNetworkRows(vm, { fromTemplate, init });
       const hasCreateVolumes = this.getHasCreatedVolumes(spec) || [];
 
@@ -352,6 +409,10 @@ export default {
       const efiEnabled = this.isEfiEnabled(spec);
       const tpmEnabled = this.isTpmEnabled(spec);
       const secureBoot = this.isSecureBoot(spec);
+<<<<<<< HEAD
+=======
+      const cpuPinning = this.isCpuPinning(spec);
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
       const secretRef = this.getSecret(spec);
       const accessCredentials = this.getAccessCredentials(spec);
@@ -362,6 +423,10 @@ export default {
       }
 
       this.$set(this, 'spec', spec);
+<<<<<<< HEAD
+=======
+      this.$set(this, 'maintenanceStrategy', maintenanceStrategy);
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       this.$set(this, 'runStrategy', runStrategy);
       this.$set(this, 'secretRef', secretRef);
       this.$set(this, 'accessCredentials', accessCredentials);
@@ -382,6 +447,10 @@ export default {
       this.$set(this, 'efiEnabled', efiEnabled);
       this.$set(this, 'tpmEnabled', tpmEnabled);
       this.$set(this, 'secureBoot', secureBoot);
+<<<<<<< HEAD
+=======
+      this.$set(this, 'cpuPinning', cpuPinning);
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
       this.$set(this, 'hasCreateVolumes', hasCreateVolumes);
       this.$set(this, 'networkRows', networkRows);
@@ -392,7 +461,11 @@ export default {
       this.refreshYamlEditor();
     },
 
+<<<<<<< HEAD
     getDiskRows(vm) {
+=======
+    getDiskRows(vm, volBackups) {
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       const namespace = vm.metadata.namespace;
       const _volumes = vm.spec.template.spec.volumes || [];
       const _disks = vm.spec.template.spec.domain.devices.disks || [];
@@ -401,10 +474,39 @@ export default {
       let out = [];
 
       if (_disks.length === 0) {
+<<<<<<< HEAD
+=======
+        let bus = 'virtio';
+        let type = HARD_DISK;
+        let size = '10Gi';
+
+        const imageResource = this.images.find( I => this.imageId === I.id);
+
+        const isIsoImage = /iso$/i.test(imageResource?.imageSuffix);
+        const imageSize = Math.max(imageResource?.status?.size, imageResource?.status?.virtualSize);
+        const isEncrypted = imageResource?.isEncrypted || false;
+        const volumeBackups = volBackups?.find(vBackup => vBackup.volumeName === 'disk-0') || null ;
+
+        if (isIsoImage) {
+          bus = 'sata';
+          type = CD_ROM;
+        }
+
+        if (imageSize) {
+          let imageSizeGiB = Math.ceil(imageSize / 1024 / 1024 / 1024);
+
+          if (!isIsoImage) {
+            imageSizeGiB = Math.max(imageSizeGiB, 10);
+          }
+          size = `${ imageSizeGiB }Gi`;
+        }
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         out.push({
           id:               randomStr(5),
           source:           SOURCE_TYPE.IMAGE,
           name:             'disk-0',
+<<<<<<< HEAD
           accessMode:       'ReadWriteMany',
           bus:              'virtio',
           volumeName:       '',
@@ -413,6 +515,18 @@ export default {
           storageClassName: '',
           image:            this.imageId,
           volumeMode:       'Block',
+=======
+          accessMode:       'ReadWriteMany', // root disk only support LHv1 volume, should be RWX
+          bus,
+          volumeName:       '',
+          size,
+          type,
+          storageClassName: '',
+          image:            this.imageId,
+          volumeMode:       'Block',
+          isEncrypted,
+          volumeBackups,
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         });
       } else {
         out = _disks.map( (DISK, index) => {
@@ -489,7 +603,16 @@ export default {
             minExponent: 3,
           });
 
+<<<<<<< HEAD
           const volumeStatus = this.pvcs.find(P => P.id === `${ this.value.metadata.namespace }/${ volumeName }`)?.relatedPV?.metadata?.annotations?.[HCI_ANNOTATIONS.VOLUME_ERROR];
+=======
+          const pvc = this.pvcs.find(P => P.id === `${ this.value.metadata.namespace }/${ volumeName }`);
+
+          const volumeStatus = pvc?.relatedPV?.metadata?.annotations?.[HCI_ANNOTATIONS.VOLUME_ERROR];
+
+          const isEncrypted = pvc?.isEncrypted || false;
+          const volumeBackups = volBackups?.find(vBackup => vBackup.volumeName === DISK.name) || null;
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
           return {
             id:         randomStr(5),
@@ -509,7 +632,13 @@ export default {
             hotpluggable,
             volumeStatus,
             dataSource,
+<<<<<<< HEAD
             namespace
+=======
+            namespace,
+            isEncrypted,
+            volumeBackups,
+>>>>>>> b5455bcb (fix: separate used/allocated units)
           };
         });
       }
@@ -574,6 +703,15 @@ export default {
       } else {
         vm.metadata.annotations[HCI_ANNOTATIONS.VM_RESERVED_MEMORY] = this.reservedMemory;
       }
+<<<<<<< HEAD
+=======
+
+      if (this.maintenanceStrategy === 'Migrate') {
+        delete vm.metadata.labels[HCI_ANNOTATIONS.VM_MAINTENANCE_MODE_STRATEGY];
+      } else {
+        vm.metadata.labels[HCI_ANNOTATIONS.VM_MAINTENANCE_MODE_STRATEGY] = this.maintenanceStrategy;
+      }
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     },
 
     parseDiskRows(disk) {
@@ -819,6 +957,13 @@ export default {
       }
     },
 
+<<<<<<< HEAD
+=======
+    getMaintenanceStrategyOptionLabel(opt) {
+      return this.t(`harvester.virtualMachine.maintenanceStrategy.options.${ opt.label || opt }`);
+    },
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     getInitUserData(config) {
       const _QGA_JSON = this.getMatchQGA(config.osType);
 
@@ -1339,6 +1484,17 @@ export default {
       }
     },
 
+<<<<<<< HEAD
+=======
+    setCpuPinning(value) {
+      if (value) {
+        set(this.spec.template.spec.domain.cpu, 'dedicatedCpuPlacement', true);
+      } else {
+        this.$delete(this.spec.template.spec.domain.cpu, 'dedicatedCpuPlacement');
+      }
+    },
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     setTPM(tpmEnabled) {
       if (tpmEnabled) {
         set(this.spec.template.spec.domain.devices, 'tpm', {});
@@ -1462,6 +1618,13 @@ export default {
       this.setBootMethod({ efi: this.efiEnabled, secureBoot: val });
     },
 
+<<<<<<< HEAD
+=======
+    cpuPinning(value) {
+      this.setCpuPinning(value);
+    },
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     tpmEnabled(val) {
       this.setTPM(val);
     },
diff --git a/pkg/harvester/models/devices.harvesterhci.io.pcidevice.js b/pkg/harvester/models/devices.harvesterhci.io.pcidevice.js
index 2cbbac84bcd..e4093a72fe3 100644
--- a/pkg/harvester/models/devices.harvesterhci.io.pcidevice.js
+++ b/pkg/harvester/models/devices.harvesterhci.io.pcidevice.js
@@ -36,14 +36,24 @@ export default class PCIDevice extends SteveModel {
         icon:       'icon icon-fw icon-dot',
         label:      'Enable Passthrough',
         bulkable:   true,
+<<<<<<< HEAD
         bulkAction: 'enablePassthroughBulk'
+=======
+        bulkAction: 'enablePassthroughBulk',
+        weight:     1
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       },
       {
         action:   'disablePassthrough',
         enabled:  this.isEnabling && this.claimedByMe,
         icon:     'icon icon-fw icon-dot-open',
         label:    'Disable Passthrough',
+<<<<<<< HEAD
         bulkable: true
+=======
+        bulkable: true,
+        weight:   0
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       },
     );
 
@@ -135,7 +145,11 @@ export default class PCIDevice extends SteveModel {
   enablePassthroughBulk(resources = this) {
     this.$dispatch('promptModal', {
       resources,
+<<<<<<< HEAD
       component: 'EnablePassthrough'
+=======
+      component: 'EnablePciPassthrough'
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     });
   }
 
diff --git a/pkg/harvester/models/devices.harvesterhci.io.usbdevice.js b/pkg/harvester/models/devices.harvesterhci.io.usbdevice.js
new file mode 100644
index 00000000000..ad93395ea0c
--- /dev/null
+++ b/pkg/harvester/models/devices.harvesterhci.io.usbdevice.js
@@ -0,0 +1,161 @@
+import SteveModel from '@shell/plugins/steve/steve-class';
+import { escapeHtml } from '@shell/utils/string';
+import { HCI } from '../types';
+
+const STATUS_DISPLAY = {
+  enabled: {
+    displayKey: 'generic.enabled',
+    color:      'bg-success'
+  },
+  pending: {
+    displayKey: 'generic.inProgress',
+    color:      'bg-info'
+  },
+  disabled: {
+    displayKey: 'generic.disabled',
+    color:      'bg-warning'
+  },
+  error: {
+    displayKey: 'generic.disabled',
+    color:      'bg-warning'
+  }
+};
+
+/**
+ * Class representing USB Device resource.
+ * @extends SteveModal
+ */
+export default class USBDevice extends SteveModel {
+  get _availableActions() {
+    const out = super._availableActions;
+
+    out.push(
+      {
+        action:     'enablePassthroughBulk',
+        enabled:    !this.passthroughClaim && !this.status.enabled,
+        icon:       'icon icon-fw icon-dot',
+        label:      'Enable Passthrough',
+        bulkable:   true,
+        bulkAction: 'enablePassthroughBulk',
+        weight:     1
+      },
+      {
+        action:   'disablePassthrough',
+        enabled:  this.status.enabled,
+        icon:     'icon icon-fw icon-dot-open',
+        label:    'Disable Passthrough',
+        bulkable: true,
+        weight:   0
+      },
+    );
+
+    return out;
+  }
+
+  get canYaml() {
+    return false;
+  }
+
+  get canDelete() {
+    return false;
+  }
+
+  goToDetail() {
+    return false;
+  }
+
+  goToEdit() {
+    return false;
+  }
+
+  get passthroughClaim() {
+    const passthroughClaims = this.$getters['all'](HCI.USB_CLAIM) || [];
+
+    return !!this.status && passthroughClaims.find(req => req?.status?.nodeName === this.status?.nodeName && req?.metadata?.name === this.metadata?.name);
+  }
+
+  // this is an id for each 'type' of device - there may be multiple instances of device CRs
+  get uniqueId() {
+    return `${ this.status?.vendorId }:${ this.status?.deviceId }`;
+  }
+
+  get claimedBy() {
+    return this.passthroughClaim?.spec?.userName;
+  }
+
+  get claimedByMe() {
+    if (!this.passthroughClaim) {
+      return false;
+    }
+    const isSingleProduct = this.$rootGetters['isSingleProduct'];
+    let userName = 'admin';
+
+    // if this is imported Harvester, there may be users other than admin
+    if (!isSingleProduct) {
+      const user = this.$rootGetters['auth/v3User'];
+
+      userName = user?.username || user?.id;
+    }
+
+    return this.claimedBy === userName;
+  }
+
+  // map status.passthroughEnabled to disabled/enabled & overwrite default dash colors
+  get claimStatusDisplay() {
+    if (!this.passthroughClaim) {
+      return STATUS_DISPLAY.disabled;
+    }
+    if (this.status.enabled) {
+      return STATUS_DISPLAY.enabled;
+    }
+
+    return STATUS_DISPLAY.pending;
+  }
+
+  get stateDisplay() {
+    const t = this.$rootGetters['i18n/t'];
+
+    return t(this.claimStatusDisplay.displayKey);
+  }
+
+  get stateBackground() {
+    return this.claimStatusDisplay.color;
+  }
+
+  // 'enable' passthrough creates the passthrough claim CRD -
+  enablePassthroughBulk(resources = this) {
+    this.$dispatch('promptModal', {
+      resources,
+      component: 'EnableUSBPassthrough'
+    });
+  }
+
+  // 'disable' passthrough deletes claim
+  // backend should return error if device is in use
+  async disablePassthrough() {
+    try {
+      if (!this.claimedByMe) {
+        throw new Error(this.$rootGetters['i18n/t']('harvester.usb.cantUnclaim', { name: escapeHtml(this.metadata.name) }));
+      } else {
+        await this.passthroughClaim.remove();
+      }
+    } catch (err) {
+      this.$dispatch('growl/fromError', {
+        title: this.$rootGetters['i18n/t']('harvester.usb.unclaimError', { name: escapeHtml(this.metadata.name) }),
+        err,
+      }, { root: true });
+    }
+  }
+
+  // group device list by node
+  get groupByNode() {
+    const name = this.status?.nodeName || this.$rootGetters['i18n/t']('generic.none');
+
+    return this.$rootGetters['i18n/t']('resourceTable.groupLabel.node', { name: escapeHtml(name) });
+  }
+
+  // group device list by unique device (same vendorid and deviceid)
+  get groupByDevice() {
+    return this.status?.description;
+  }
+}
diff --git a/pkg/harvester/models/harvester/namespace.js b/pkg/harvester/models/harvester/namespace.js
index 4d392df9d2e..b3c2e734616 100644
--- a/pkg/harvester/models/harvester/namespace.js
+++ b/pkg/harvester/models/harvester/namespace.js
@@ -5,6 +5,10 @@ import SYSTEM_NAMESPACES from '@shell/config/system-namespaces';
 import { get } from '@shell/utils/object';
 import { NAMESPACE } from '@shell/config/types';
 import { PRODUCT_NAME as HARVESTER_PRODUCT } from '@pkg/harvester/config/harvester';
+<<<<<<< HEAD
+=======
+import { HCI } from '../../types';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 const OBSCURE_NAMESPACE_PREFIX = [
   'c-', // cluster namespace
@@ -37,15 +41,41 @@ export default class HciNamespace extends namespace {
       weight:     -10,
     };
 
+<<<<<<< HEAD
+=======
+    const editQuotaAction = {
+      action:  'editNSQuota',
+      label:   this.t('harvester.modal.quota.editQuota'),
+      icon:    'icon icon-storage',
+      enabled: !!this?.actions?.updateResourceQuota && !!this?.actions?.deleteResourceQuota,
+      weight:  -11,
+    };
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     if (remove > -1) {
       out.splice(remove, 1);
     }
 
     insertAt(out, out.length - 1, promptRemove);
+<<<<<<< HEAD
+=======
+    insertAt(out, out.length - 5, editQuotaAction);
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
     return out;
   }
 
+<<<<<<< HEAD
+=======
+  editNSQuota(resources = this) {
+    this.$dispatch('promptModal', {
+      resources,
+      snapshotSizeQuota: this.snapshotSizeQuota,
+      component:         'HarvesterQuotaDialog'
+    });
+  }
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   promptRemove(resources = this) {
     this.$dispatch('promptModal', {
       resources,
@@ -54,6 +84,20 @@ export default class HciNamespace extends namespace {
     });
   }
 
+<<<<<<< HEAD
+=======
+  get nsResourceQuota() {
+    const inStore = this.$rootGetters['currentProduct'].inStore;
+    const allResQuotas = this.$rootGetters[`${ inStore }/all`](HCI.RESOURCE_QUOTA);
+
+    return allResQuotas.find( RQ => RQ.metadata.namespace === this.id);
+  }
+
+  get snapshotSizeQuota() {
+    return this.nsResourceQuota?.spec?.snapshotLimit?.namespaceTotalSnapshotSizeQuota;
+  }
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   get isSystem() {
     const systemNamespaces = ['fleet-default'];
 
diff --git a/pkg/harvester/models/harvester/node.js b/pkg/harvester/models/harvester/node.js
index e1c77ec941d..6057b6981d8 100644
--- a/pkg/harvester/models/harvester/node.js
+++ b/pkg/harvester/models/harvester/node.js
@@ -59,6 +59,25 @@ export default class HciNode extends HarvesterResource {
       total:   1
     };
 
+<<<<<<< HEAD
+=======
+    const enableCPUManager = {
+      action:  'enableCPUManager',
+      enabled: this.hasAction('enableCPUManager') && !this.isCPUManagerEnableInProgress && !this.isCPUManagerEnabled && !this.isEtcd, // witness node doesn't have CPU manager
+      icon:    'icon icon-fw icon-os-management',
+      label:   this.t('harvester.action.enableCPUManager'),
+      total:   1
+    };
+
+    const disableCPUManager = {
+      action:  'disableCPUManager',
+      enabled: this.hasAction('disableCPUManager') && !this.isCPUManagerEnableInProgress && this.isCPUManagerEnabled && !this.isEtcd,
+      icon:    'icon icon-fw icon-os-management',
+      label:   this.t('harvester.action.disableCPUManager'),
+      total:   1
+    };
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     const shutDown = {
       action:  'shutDown',
       enabled: this.hasAction('powerActionPossible') && this.hasAction('powerAction') && !this.isStopped && !!this.inventory,
@@ -88,6 +107,11 @@ export default class HciNode extends HarvesterResource {
       uncordon,
       enableMaintenance,
       disableMaintenance,
+<<<<<<< HEAD
+=======
+      enableCPUManager,
+      disableCPUManager,
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       shutDown,
       powerOn,
       reboot,
@@ -134,6 +158,7 @@ export default class HciNode extends HarvesterResource {
 
   get consoleUrl() {
     const url = this.metadata?.annotations?.[HCI_ANNOTATIONS.HOST_CONSOLE_URL];
+<<<<<<< HEAD
 
     if (!url) {
       return false;
@@ -143,6 +168,14 @@ export default class HciNode extends HarvesterResource {
       return `http://${ url }`;
     }
 
+=======
+    const validator = /^[a-z]+:\/\//;
+
+    if (!url?.match(validator)) {
+      return false;
+    }
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     return url;
   }
 
@@ -308,6 +341,17 @@ export default class HciNode extends HarvesterResource {
     this.doAction('disableMaintenanceMode', {});
   }
 
+<<<<<<< HEAD
+=======
+  enableCPUManager() {
+    this.doActionGrowl('enableCPUManager', {});
+  }
+
+  disableCPUManager() {
+    this.doActionGrowl('disableCPUManager', {});
+  }
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   get isUnSchedulable() {
     return (
       this.metadata?.labels?.[HCI_ANNOTATIONS.NODE_SCHEDULABLE] === 'false' ||
@@ -347,6 +391,31 @@ export default class HciNode extends HarvesterResource {
     );
   }
 
+<<<<<<< HEAD
+=======
+  get isCPUManagerEnabled() {
+    return this.metadata?.labels?.[HCI_ANNOTATIONS.CPU_MANAGER] === 'true';
+  }
+
+  get isCPUManagerEnableInProgress() {
+    return this.cpuManagerUpdateStatus === 'requested' || this.cpuManagerUpdateStatus === 'running';
+  }
+
+  get isCPUManagerEnableFailed() {
+    return this.cpuManagerUpdateStatus === 'failed';
+  }
+
+  get cpuManagerUpdateStatus() {
+    try {
+      const cpuManagerUpdate = JSON.parse(this.metadata.annotations[HCI_ANNOTATIONS.NODE_CPU_MANAGER_UPDATE_STATUS] || '{}');
+
+      return cpuManagerUpdate.status || '';
+    } catch {
+      return '';
+    }
+  }
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   get longhornDisks() {
     const inStore = this.$rootGetters['currentProduct'].inStore;
     const longhornNode = this.$rootGetters[`${ inStore }/byId`](
@@ -444,7 +513,11 @@ export default class HciNode extends HarvesterResource {
   get unProvisionedDisks() {
     const blockDevices = this.blockDevices || [];
 
+<<<<<<< HEAD
     return blockDevices.filter(d => d?.spec?.fileSystem?.provisioned && d?.status?.provisionPhase !== 'Provisioned');
+=======
+    return blockDevices.filter(d => d?.isProvisioned && d?.status?.provisionPhase !== 'Provisioned');
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   }
 
   get diskStatusCount() {
diff --git a/pkg/harvester/models/harvester/persistentvolumeclaim.js b/pkg/harvester/models/harvester/persistentvolumeclaim.js
index 1b65741159c..53035a69e25 100644
--- a/pkg/harvester/models/harvester/persistentvolumeclaim.js
+++ b/pkg/harvester/models/harvester/persistentvolumeclaim.js
@@ -2,7 +2,11 @@ import Vue from 'vue';
 import { _CLONE } from '@shell/config/query-params';
 import pick from 'lodash/pick';
 import { HCI, VOLUME_SNAPSHOT } from '../../types';
+<<<<<<< HEAD
 import { PV, LONGHORN } from '@shell/config/types';
+=======
+import { PV, LONGHORN, STORAGE_CLASS } from '@shell/config/types';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 import { DESCRIPTION } from '@shell/config/labels-annotations';
 import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
 import { findBy } from '@shell/utils/array';
@@ -10,8 +14,18 @@ import { get, clone } from '@shell/utils/object';
 import { colorForState } from '@shell/plugins/dashboard-store/resource-class';
 import HarvesterResource from '../harvester';
 import { PRODUCT_NAME as HARVESTER_PRODUCT } from '../../config/harvester';
+<<<<<<< HEAD
 
 const DEGRADED_ERROR = 'replica scheduling failed';
+=======
+import { LVM_DRIVER } from './storage.k8s.io.storageclass';
+import { LONGHORN_DRIVER } from '@shell/models/persistentvolume';
+
+const DEGRADED_ERRORS = ['replica scheduling failed', 'precheck new replica failed'];
+
+export const DATA_ENGINE_V1 = 'v1';
+export const DATA_ENGINE_V2 = 'v2';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 export default class HciPv extends HarvesterResource {
   applyDefaults(_, realMode) {
@@ -31,6 +45,10 @@ export default class HciPv extends HarvesterResource {
 
   get availableActions() {
     const out = super._availableActions;
+<<<<<<< HEAD
+=======
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     const clone = out.find(action => action.action === 'goToClone');
 
     if (clone) {
@@ -40,22 +58,38 @@ export default class HciPv extends HarvesterResource {
     return [
       {
         action:  'exportImage',
+<<<<<<< HEAD
         enabled: this.hasAction('export'),
+=======
+        enabled: this.hasAction('export') && !this.isEncrypted,
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         icon:    'icon icon-copy',
         label:   this.t('harvester.action.exportImage')
       },
       {
+<<<<<<< HEAD
         action:  'cancelExpand',
         enabled: this.hasAction('cancelExpand'),
         icon:    'icon icon-backup',
         label:   this.t('harvester.action.cancelExpand')
       },
       {
+=======
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         action:  'snapshot',
         enabled: this.hasAction('snapshot'),
         icon:    'icon icon-backup',
         label:   this.t('harvester.action.snapshot'),
       },
+<<<<<<< HEAD
+=======
+      {
+        action:  'cancelExpand',
+        enabled: this.hasAction('cancelExpand'),
+        icon:    'icon icon-backup',
+        label:   this.t('harvester.action.cancelExpand')
+      },
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       ...out
     ];
   }
@@ -94,21 +128,39 @@ export default class HciPv extends HarvesterResource {
     this.metadata.annotations = pick(this.metadata.annotations, keys);
   }
 
+<<<<<<< HEAD
+=======
+  get storageClass() {
+    const inStore = this.$rootGetters['currentProduct'].inStore;
+
+    return this.$rootGetters[`${ inStore }/all`](STORAGE_CLASS).find(sc => sc.name === this.spec.storageClassName);
+  }
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   get canUpdate() {
     return this.hasLink('update');
   }
 
   get stateDisplay() {
+<<<<<<< HEAD
     const ownedBy = this?.metadata?.annotations?.[HCI_ANNOTATIONS.OWNED_BY];
     const volumeError = this.relatedPV?.metadata?.annotations?.[HCI_ANNOTATIONS.VOLUME_ERROR];
     const degradedVolume = volumeError === DEGRADED_ERROR;
+=======
+    const volumeError = this.relatedPV?.metadata?.annotations?.[HCI_ANNOTATIONS.VOLUME_ERROR];
+    const degradedVolume = DEGRADED_ERRORS.includes(volumeError);
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     const status = this?.status?.phase === 'Bound' && !volumeError && this.isLonghornVolumeReady ? 'Ready' : 'Not Ready';
 
     const conditions = this?.status?.conditions || [];
 
     if (findBy(conditions, 'type', 'Resizing')?.status === 'True') {
       return 'Resizing';
+<<<<<<< HEAD
     } else if (ownedBy && !volumeError) {
+=======
+    } else if (!!this.attachVM && !volumeError) {
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       return 'In-use';
     } else if (degradedVolume) {
       return 'Degraded';
@@ -120,7 +172,11 @@ export default class HciPv extends HarvesterResource {
   // state is similar with stateDisplay, the reason we keep this property is the status of In-use should not be displayed on vm detail page
   get state() {
     const volumeError = this.relatedPV?.metadata?.annotations?.[HCI_ANNOTATIONS.VOLUME_ERROR];
+<<<<<<< HEAD
     const degradedVolume = volumeError === DEGRADED_ERROR;
+=======
+    const degradedVolume = DEGRADED_ERRORS.includes(volumeError);
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     let status = this?.status?.phase === 'Bound' && !volumeError ? 'Ready' : 'Not Ready';
 
     const conditions = this?.status?.conditions || [];
@@ -180,6 +236,7 @@ export default class HciPv extends HarvesterResource {
   }
 
   get attachVM() {
+<<<<<<< HEAD
     const allVMs = this.$rootGetters['harvester/all'](HCI.VM);
     const ownedBy =
       get(this, `metadata.annotations."${ HCI_ANNOTATIONS.OWNED_BY }"`) || '';
@@ -191,6 +248,21 @@ export default class HciPv extends HarvesterResource {
     const ownedId = JSON.parse(ownedBy)[0]?.refs?.[0];
 
     return allVMs.find(D => D.id === ownedId);
+=======
+    const allVMs = this.$rootGetters['harvester/all'](HCI.VM) || [];
+
+    const findAttachVM = (vm) => {
+      const attachVolumes = vm.spec.template?.spec?.volumes || [];
+
+      if (vm.namespace === this.namespace && attachVolumes.length > 0) {
+        return attachVolumes.find(vol => vol.persistentVolumeClaim?.claimName === this.name);
+      }
+
+      return null;
+    };
+
+    return allVMs.find(findAttachVM);
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   }
 
   get isAvailable() {
@@ -215,6 +287,13 @@ export default class HciPv extends HarvesterResource {
     return false;
   }
 
+<<<<<<< HEAD
+=======
+  get isEncrypted() {
+    return this.relatedPV?.spec.csi.volumeAttributes.encrypted === 'true';
+  }
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   get longhornVolume() {
     const inStore = this.$rootGetters['currentProduct'].inStore;
 
@@ -279,6 +358,29 @@ export default class HciPv extends HarvesterResource {
     return this.$rootGetters['harvester/all'](PV).find(pv => pv.metadata?.name === this.spec?.volumeName);
   }
 
+<<<<<<< HEAD
+=======
+  get volumeProvider() {
+    return this.relatedPV?.spec.csi?.driver;
+  }
+
+  get dataEngine() {
+    return this.relatedPV?.spec.csi?.volumeAttributes?.dataEngine;
+  }
+
+  get isLvm() {
+    return this.volumeProvider === LVM_DRIVER;
+  }
+
+  get isLonghorn() {
+    return this.volumeProvider === LONGHORN_DRIVER;
+  }
+
+  get isLonghornV2() {
+    return this.dataEngine === DATA_ENGINE_V2;
+  }
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   get resourceExternalLink() {
     const host = window.location.host;
     const { params } = this.currentRoute();
diff --git a/pkg/harvester/models/harvester/secret.js b/pkg/harvester/models/harvester/secret.js
index 0c8536ddd5b..657d7322f61 100644
--- a/pkg/harvester/models/harvester/secret.js
+++ b/pkg/harvester/models/harvester/secret.js
@@ -2,6 +2,10 @@ import { clone } from '@shell/utils/object';
 import { HCI } from '../../types';
 import { PRODUCT_NAME as HARVESTER_PRODUCT } from '../../config/harvester';
 import Secret from '@shell/models/secret';
+<<<<<<< HEAD
+=======
+import { NAMESPACE } from '@shell/config/types';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 export default class HciSecret extends Secret {
   get _detailLocation() {
@@ -52,6 +56,17 @@ export default class HciSecret extends Secret {
     return this.doneOverride;
   }
 
+<<<<<<< HEAD
+=======
+  get isSystem() {
+    const inStore = this.$rootGetters['currentProduct'].inStore;
+
+    const systemNs = this.$rootGetters[`${ inStore }/all`](NAMESPACE).filter(ns => ns.isSystem === true).map(ns => ns.metadata.name);
+
+    return systemNs.includes(this.metadata.namespace);
+  }
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   get details() {
     const out = [
       {
diff --git a/pkg/harvester/models/harvester/storage.k8s.io.storageclass.js b/pkg/harvester/models/harvester/storage.k8s.io.storageclass.js
index 80dffc49df6..0b4d95dbfb2 100644
--- a/pkg/harvester/models/harvester/storage.k8s.io.storageclass.js
+++ b/pkg/harvester/models/harvester/storage.k8s.io.storageclass.js
@@ -2,6 +2,13 @@ import { clone } from '@shell/utils/object';
 import { HCI } from '../../types';
 import StorageClass from '@shell/models/storage.k8s.io.storageclass';
 import { PRODUCT_NAME as HARVESTER_PRODUCT } from '../../config/harvester';
+<<<<<<< HEAD
+=======
+import { LONGHORN_DRIVER } from '@shell/models/persistentvolume';
+import { DATA_ENGINE_V1, DATA_ENGINE_V2 } from '../../models/harvester/persistentvolumeclaim';
+
+export const LVM_DRIVER = 'lvm.driver.harvesterhci.io';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 export default class HciStorageClass extends StorageClass {
   get detailLocation() {
@@ -31,4 +38,33 @@ export default class HciStorageClass extends StorageClass {
   get parentNameOverride() {
     return this.$rootGetters['i18n/t'](`typeLabel."${ HCI.STORAGE }"`, { count: 1 })?.trim();
   }
+<<<<<<< HEAD
+=======
+
+  get longhornVersion() {
+    if (this.provisioner === LONGHORN_DRIVER) {
+      return (this.parameters || {}).dataEngine || DATA_ENGINE_V1;
+    }
+
+    return null;
+  }
+
+  get provisionerDisplay() {
+    let key = '';
+
+    if (this.provisioner === LONGHORN_DRIVER) {
+      key = `harvester.storage.storageClass.longhorn.${ this.longhornVersion }.label`;
+    }
+
+    if (this.provisioner === LVM_DRIVER) {
+      key = `harvester.storage.storageClass.lvm.label`;
+    }
+
+    return key ? this.$rootGetters['i18n/t'](key) : this.provisioner;
+  }
+
+  get isLonghornV2() {
+    return this.provisioner === LONGHORN_DRIVER && this.longhornVersion === DATA_ENGINE_V2;
+  }
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 }
diff --git a/pkg/harvester/models/harvesterhci.io.addon.js b/pkg/harvester/models/harvesterhci.io.addon.js
index e7ff9d459ae..37b79cb75cc 100644
--- a/pkg/harvester/models/harvesterhci.io.addon.js
+++ b/pkg/harvester/models/harvesterhci.io.addon.js
@@ -2,6 +2,10 @@ import HarvesterResource from './harvester';
 import { HCI as HCI_ANNOTATIONS } from '../config/labels-annotations';
 import jsyaml from 'js-yaml';
 import startCase from 'lodash/startCase';
+<<<<<<< HEAD
+=======
+import { HCI } from '../types';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 export default class HciAddonConfig extends HarvesterResource {
   get availableActions() {
@@ -106,6 +110,13 @@ export default class HciAddonConfig extends HarvesterResource {
     return failedCondition?.message || super.stateDescription;
   }
 
+<<<<<<< HEAD
+=======
+  get parentNameOverride() {
+    return this.$rootGetters['i18n/t'](`typeLabel."${ HCI.ADD_ONS }"`, { count: 1 })?.trim();
+  }
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   get displayName() {
     const isExperimental = this.metadata?.labels?.[HCI_ANNOTATIONS.ADDON_EXPERIMENTAL] === 'true';
 
diff --git a/pkg/harvester/models/harvesterhci.io.blockdevice.js b/pkg/harvester/models/harvesterhci.io.blockdevice.js
index 06078faf692..c22912ee863 100644
--- a/pkg/harvester/models/harvesterhci.io.blockdevice.js
+++ b/pkg/harvester/models/harvesterhci.io.blockdevice.js
@@ -15,7 +15,11 @@ export default class HciBlockDevice extends HarvesterResource {
   }
 
   get isChildPartProvisioned() {
+<<<<<<< HEAD
     const parts = this.childParts.filter(p => p.spec?.fileSystem?.provisioned) || [];
+=======
+    const parts = this.childParts.filter(p => p.isProvisioned) || [];
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
     return parts.length > 0;
   }
@@ -59,4 +63,12 @@ export default class HciBlockDevice extends HarvesterResource {
 
     return formatting.status === 'True';
   }
+<<<<<<< HEAD
+=======
+
+  get isProvisioned() {
+    // spec.fileSystem.provisioned is deprecated
+    return this.spec?.fileSystem?.provisioned || this.spec?.provision;
+  }
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 }
diff --git a/pkg/harvester/models/harvesterhci.io.schedulevmbackup.js b/pkg/harvester/models/harvesterhci.io.schedulevmbackup.js
new file mode 100644
index 00000000000..13a2f566100
--- /dev/null
+++ b/pkg/harvester/models/harvesterhci.io.schedulevmbackup.js
@@ -0,0 +1,97 @@
+import HarvesterResource from './harvester';
+import { get } from '@shell/utils/object';
+import { findBy } from '@shell/utils/array';
+import { colorForState, stateDisplay, STATES } from '@shell/plugins/dashboard-store/resource-class';
+import { _CREATE } from '@shell/config/query-params';
+import { ucFirst, escapeHtml } from '@shell/utils/string';
+
+export default class ScheduleVmBackup extends HarvesterResource {
+  detailPageHeaderActionOverride(realMode) {
+    if (realMode === _CREATE) {
+      return this.t('harvester.schedule.createTitle');
+    }
+  }
+
+  get _availableActions() {
+    const toFilter = ['goToClone'];
+
+    const out = super._availableActions.filter((action) => {
+      if (!toFilter.includes(action.action)) {
+        return action;
+      }
+    });
+
+    return [
+      {
+        action:  'resumeSchedule',
+        enabled: ucFirst(this.state) === STATES.suspended.label,
+        icon:    'icons icon-play',
+        label:   this.t('harvester.action.resumeSchedule'),
+      },
+      {
+        action:  'suspendSchedule',
+        enabled: ucFirst(this.state) === STATES.active.label,
+        icon:    'icons icon-pause',
+        label:   this.t('harvester.action.suspendSchedule'),
+      },
+      ...out
+    ];
+  }
+
+  async suspendSchedule() {
+    try {
+      this.spec.suspend = true; // suspend schedule
+      await this.save();
+    } catch (err) {
+      this.spec.suspend = false;
+
+      this.$dispatch('growl/fromError', {
+        title: this.t('generic.notification.title.error', { name: escapeHtml(this.metadata.name) }),
+        err,
+      }, { root: true });
+    }
+  }
+
+  async resumeSchedule() {
+    try {
+      this.spec.suspend = false; // resume schedule
+      await this.save();
+    } catch (err) {
+      this.spec.suspend = true;
+
+      this.$dispatch('growl/fromError', {
+        title: this.t('generic.notification.title.error', { name: escapeHtml(this.metadata.name) }),
+        err,
+      }, { root: true });
+    }
+  }
+
+  get state() {
+    const conditions = get(this, 'status.conditions');
+    const isSuspended = findBy(conditions, 'type', 'BackupSuspend')?.status === 'True';
+
+    if (isSuspended) {
+      return STATES.suspended.label;
+    }
+
+    return this.metadata.state.name;
+  }
+
+  get stateDescription() {
+    const suspendedCondition = (this.status?.conditions || []).find(c => c.type === 'BackupSuspend');
+
+    return ucFirst(suspendedCondition?.message) || super.stateDescription;
+  }
+
+  get stateBackground() {
+    return colorForState(this.stateDisplay).replace('text-', 'bg-');
+  }
+
+  get stateColor() {
+    return colorForState(this.state);
+  }
+
+  get stateDisplay() {
+    return stateDisplay(this.state);
+  }
+}
diff --git a/pkg/harvester/models/harvesterhci.io.virtualmachinebackup.js b/pkg/harvester/models/harvesterhci.io.virtualmachinebackup.js
index 8857f1352e9..0b44939368a 100644
--- a/pkg/harvester/models/harvesterhci.io.virtualmachinebackup.js
+++ b/pkg/harvester/models/harvesterhci.io.virtualmachinebackup.js
@@ -2,6 +2,10 @@ import { HCI } from '../types';
 import { get, clone } from '@shell/utils/object';
 import { findBy } from '@shell/utils/array';
 import { colorForState } from '@shell/plugins/dashboard-store/resource-class';
+<<<<<<< HEAD
+=======
+import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 import { _CREATE } from '@shell/config/query-params';
 import HarvesterResource from './harvester';
 import { PRODUCT_NAME as HARVESTER_PRODUCT } from '../config/harvester';
@@ -18,9 +22,14 @@ export default class HciVmBackup extends HarvesterResource {
 
   get detailLocation() {
     const detailLocation = clone(this._detailLocation);
+<<<<<<< HEAD
     const route = this.currentRoute();
 
     detailLocation.params.resource = route.params.resource;
+=======
+
+    detailLocation.params.resource = HCI.BACKUP;
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
     return detailLocation;
   }
@@ -81,6 +90,7 @@ export default class HciVmBackup extends HarvesterResource {
   }
 
   restoreExistingVM(resource = this) {
+<<<<<<< HEAD
     const route = this.currentRoute();
     const router = this.currentRouter();
 
@@ -88,10 +98,23 @@ export default class HciVmBackup extends HarvesterResource {
       name:   `${ HARVESTER_PRODUCT }-c-cluster-resource-create`,
       params: { resource: route.params.resource },
       query:  { restoreMode: 'existing', resourceName: resource.name }
+=======
+    const router = this.currentRouter();
+    const targetResource = resource.spec.type === BACKUP_TYPE.BACKUP ? HCI.BACKUP : HCI.VM_SNAPSHOT;
+
+    router.push({
+      name:   `${ HARVESTER_PRODUCT }-c-cluster-resource-create`,
+      params: { resource: targetResource },
+      query:  {
+        restoreMode:  'existing',
+        resourceName: resource.name,
+      }
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     });
   }
 
   restoreNewVM(resource = this) {
+<<<<<<< HEAD
     const route = this.currentRoute();
     const router = this.currentRouter();
 
@@ -99,6 +122,18 @@ export default class HciVmBackup extends HarvesterResource {
       name:   `${ HARVESTER_PRODUCT }-c-cluster-resource-create`,
       params: { resource: route.params.resource },
       query:  { restoreMode: 'new', resourceName: resource.name }
+=======
+    const router = this.currentRouter();
+    const targetResource = resource.spec.type === BACKUP_TYPE.BACKUP ? HCI.BACKUP : HCI.VM_SNAPSHOT;
+
+    router.push({
+      name:   `${ HARVESTER_PRODUCT }-c-cluster-resource-create`,
+      params: { resource: targetResource },
+      query:  {
+        restoreMode:  'new',
+        resourceName: resource.name,
+      }
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     });
   }
 
@@ -125,6 +160,13 @@ export default class HciVmBackup extends HarvesterResource {
     return colorForState(state);
   }
 
+<<<<<<< HEAD
+=======
+  get sourceSchedule() {
+    return this.metadata?.annotations[HCI_ANNOTATIONS.SVM_BACKUP_ID];
+  }
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   get attachVM() {
     return this.spec.source.name;
   }
diff --git a/pkg/harvester/models/harvesterhci.io.virtualmachineimage.js b/pkg/harvester/models/harvesterhci.io.virtualmachineimage.js
index a3067801641..03a33364e89 100644
--- a/pkg/harvester/models/harvesterhci.io.virtualmachineimage.js
+++ b/pkg/harvester/models/harvesterhci.io.virtualmachineimage.js
@@ -12,6 +12,15 @@ import { stateDisplay, colorForState } from '@shell/plugins/dashboard-store/reso
 import { _CLONE } from '@shell/config/query-params';
 import HarvesterResource from './harvester';
 import { PRODUCT_NAME as HARVESTER_PRODUCT } from '../config/harvester';
+<<<<<<< HEAD
+=======
+import { CSI_SECRETS } from '@pkg/harvester/config/harvester-map';
+
+const {
+  CSI_PROVISIONER_SECRET_NAME,
+  CSI_PROVISIONER_SECRET_NAMESPACE,
+} = CSI_SECRETS;
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 function isReady() {
   function getStatusConditionOfType(type, defaultValue = []) {
@@ -53,6 +62,23 @@ export default class HciVmImage extends HarvesterResource {
         disabled: !this.isReady,
       },
       {
+<<<<<<< HEAD
+=======
+        action:   'encryptImage',
+        enabled:  !this.isEncrypted,
+        icon:     'icon icon-lock',
+        label:    this.t('harvester.action.encryptImage'),
+        disabled: !this.isReady,
+      },
+      {
+        action:   'decryptImage',
+        enabled:  this.isEncrypted,
+        icon:     'icon icon-unlock',
+        label:    this.t('harvester.action.decryptImage'),
+        disabled: !this.isReady,
+      },
+      {
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         action:  'download',
         enabled: this.links?.download,
         icon:    'icon icon-download',
@@ -62,6 +88,39 @@ export default class HciVmImage extends HarvesterResource {
     ];
   }
 
+<<<<<<< HEAD
+=======
+  encryptImage() {
+    const router = this.currentRouter();
+
+    router.push({
+      name:   `${ HARVESTER_PRODUCT }-c-cluster-resource-create`,
+      params: { resource: HCI.IMAGE },
+      query:  {
+        image:           this,
+        fromPage:        HCI.IMAGE,
+        sourceType:      'clone',
+        cryptoOperation: 'encrypt'
+      }
+    });
+  }
+
+  decryptImage() {
+    const router = this.currentRouter();
+
+    router.push({
+      name:   `${ HARVESTER_PRODUCT }-c-cluster-resource-create`,
+      params: { resource: HCI.IMAGE },
+      query:  {
+        image:           this,
+        fromPage:        HCI.IMAGE,
+        sourceType:      'clone',
+        cryptoOperation: 'decrypt'
+      }
+    });
+  }
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   applyDefaults(resources = this, realMode) {
     if (realMode !== _CLONE) {
       Vue.set(this.metadata, 'labels', { [HCI_ANNOTATIONS.OS_TYPE]: '', [HCI_ANNOTATIONS.IMAGE_SUFFIX]: '' });
@@ -102,6 +161,13 @@ export default class HciVmImage extends HarvesterResource {
     const imported = this.getStatusConditionOfType('Imported');
 
     if (imported?.status === 'Unknown') {
+<<<<<<< HEAD
+=======
+      if (this.spec.sourceType === 'restore') {
+        return 'Restoring';
+      }
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       if (this.spec.sourceType === 'download') {
         return 'Downloading';
       }
@@ -124,6 +190,31 @@ export default class HciVmImage extends HarvesterResource {
     return stateDisplay(this.metadata.state.name);
   }
 
+<<<<<<< HEAD
+=======
+  get encryptionSecret() {
+    const secretNS = this.spec.storageClassParameters[CSI_PROVISIONER_SECRET_NAMESPACE];
+    const secretName = this.spec.storageClassParameters[CSI_PROVISIONER_SECRET_NAME];
+
+    if (secretNS && secretName) {
+      return `${ secretNS }/${ secretName }`;
+    }
+
+    return '';
+  }
+
+  get isEncrypted() {
+    return this.spec.sourceType === 'clone' &&
+    this.spec.securityParameters?.cryptoOperation === 'encrypt' &&
+    !!this.spec.securityParameters?.sourceImageName &&
+    !!this.spec.securityParameters?.sourceImageNamespace;
+  }
+
+  get displayNameWithNamespace() {
+    return `${ this.metadata.namespace }/${ this.spec.displayName }`;
+  }
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   get imageMessage() {
     if (this.uploadError) {
       return ucFirst(this.uploadError);
@@ -169,6 +260,24 @@ export default class HciVmImage extends HarvesterResource {
     });
   }
 
+<<<<<<< HEAD
+=======
+  get virtualSize() {
+    const virtualSize = this.status?.virtualSize;
+
+    if (!virtualSize) {
+      return '-';
+    }
+
+    return formatSi(virtualSize, {
+      increment:    1024,
+      maxPrecision: 2,
+      suffix:       'B',
+      firstSuffix:  'B',
+    });
+  }
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   getStatusConditionOfType(type, defaultValue = []) {
     const conditions = Array.isArray(get(this, 'status.conditions')) ? this.status.conditions : defaultValue;
 
diff --git a/pkg/harvester/models/kubevirt.io.virtualmachine.js b/pkg/harvester/models/kubevirt.io.virtualmachine.js
index 9c24ab88bab..7b11544acf8 100644
--- a/pkg/harvester/models/kubevirt.io.virtualmachine.js
+++ b/pkg/harvester/models/kubevirt.io.virtualmachine.js
@@ -1,7 +1,11 @@
 import Vue from 'vue';
 import { load } from 'js-yaml';
 import { omitBy, pickBy } from 'lodash';
+<<<<<<< HEAD
 
+=======
+import { PRODUCT_NAME as HARVESTER_PRODUCT } from '../config/harvester';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 import { colorForState } from '@shell/plugins/dashboard-store/resource-class';
 import { POD, NODE, PVC } from '@shell/config/types';
 import { HCI } from '../types';
@@ -134,7 +138,11 @@ export default class VirtVm extends HarvesterResource {
       {
         action:  'softrebootVM',
         enabled: !!this.actions?.softreboot,
+<<<<<<< HEAD
         icon:    'icon icon-refresh',
+=======
+        icon:    'icon icon-pipeline',
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         label:   this.t('harvester.action.softreboot')
       },
       {
@@ -153,10 +161,29 @@ export default class VirtVm extends HarvesterResource {
       {
         action:  'takeVMSnapshot',
         enabled: !!this.actions?.backup,
+<<<<<<< HEAD
         icon:    'icon icon-backup',
         label:   this.t('harvester.action.vmSnapshot')
       },
       {
+=======
+        icon:    'icon icon-snapshot',
+        label:   this.t('harvester.action.vmSnapshot')
+      },
+      {
+        action:  'editVMQuota',
+        enabled: !!this.actions?.updateResourceQuota && !!this.actions.deleteResourceQuota,
+        icon:    'icon icon-storage',
+        label:   this.t('harvester.action.editVMQuota')
+      },
+      {
+        action:  'createSchedule',
+        enabled: true,
+        icon:    'icon icon-history',
+        label:   this.t('harvester.action.createSchedule')
+      },
+      {
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         action:  'restoreVM',
         enabled: !!this.actions?.restore,
         icon:    'icon icon-backup-restore',
@@ -318,6 +345,19 @@ export default class VirtVm extends HarvesterResource {
     );
   }
 
+<<<<<<< HEAD
+=======
+  createSchedule(resources = this) {
+    const router = this.currentRouter();
+
+    router.push({
+      name:   `${ HARVESTER_PRODUCT }-c-cluster-resource-create`,
+      params: { resource: HCI.SCHEDULE_VM_BACKUP },
+      query:  { vmNamespace: this.metadata.namespace, vmName: this.metadata.name }
+    });
+  }
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   backupVM(resources = this) {
     this.$dispatch('promptModal', {
       resources,
@@ -332,6 +372,17 @@ export default class VirtVm extends HarvesterResource {
     });
   }
 
+<<<<<<< HEAD
+=======
+  editVMQuota(resources = this) {
+    this.$dispatch('promptModal', {
+      resources,
+      snapshotSizeQuota: this.snapshotSizeQuota,
+      component:         'HarvesterQuotaDialog'
+    });
+  }
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   unplugVolume(diskName) {
     const resources = this;
 
@@ -446,6 +497,13 @@ export default class VirtVm extends HarvesterResource {
     return null;
   }
 
+<<<<<<< HEAD
+=======
+  get isCpuPinning() {
+    return this.spec?.template?.spec?.domain?.cpu?.dedicatedCpuPlacement === true;
+  }
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   get isVMExpectedRunning() {
     if (!this?.spec) {
       return false;
@@ -542,6 +600,20 @@ export default class VirtVm extends HarvesterResource {
     return null;
   }
 
+<<<<<<< HEAD
+=======
+  get nsResourceQuota() {
+    const inStore = this.productInStore;
+    const allResQuotas = this.$rootGetters[`${ inStore }/all`](HCI.RESOURCE_QUOTA);
+
+    return allResQuotas.find( RQ => RQ.namespace === this.metadata.namespace);
+  }
+
+  get snapshotSizeQuota() {
+    return this.nsResourceQuota?.spec?.snapshotLimit?.vmTotalSnapshotSizeQuota?.[this.metadata.name];
+  }
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   get vmi() {
     const inStore = this.productInStore;
 
@@ -550,6 +622,35 @@ export default class VirtVm extends HarvesterResource {
     return vmis.find(VMI => VMI.id === this.id);
   }
 
+<<<<<<< HEAD
+=======
+  get volumes() {
+    const pvcs = this.$rootGetters[`${ this.productInStore }/all`](PVC);
+
+    const volumeClaimNames = this.spec.template.spec.volumes?.map(v => v.persistentVolumeClaim?.claimName).filter(v => !!v) || [];
+
+    return pvcs.filter(pvc => volumeClaimNames.includes(pvc.metadata.name));
+  }
+
+  get lvmVolumes() {
+    return this.volumes.filter(volume => volume?.isLvm);
+  }
+
+  get longhornV2Volumes() {
+    return this.volumes.filter(volume => volume?.isLonghornV2);
+  }
+
+  get encryptedVolumeType() {
+    if (this.volumes.every(vol => vol.isEncrypted)) {
+      return 'all';
+    } else if (this.volumes.some(vol => vol.isEncrypted)) {
+      return 'partial';
+    } else {
+      return 'none';
+    }
+  }
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   get isError() {
     const conditions = get(this.vmi, 'status.conditions');
     const vmiFailureCond = findBy(conditions, 'type', 'Failure');
diff --git a/pkg/harvester/package.json b/pkg/harvester/package.json
index f6feed55443..0ebda8ef123 100644
--- a/pkg/harvester/package.json
+++ b/pkg/harvester/package.json
@@ -1,7 +1,11 @@
 {
   "name": "harvester",
   "description": "Cloud-Native Hyperconverged Infrastructure",
+<<<<<<< HEAD
   "version": "1.2.0",
+=======
+  "version": "1.4.0",
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   "private": false,
   "rancher": true,
   "license": "Apache-2.0",
diff --git a/pkg/harvester/pages/c/_cluster/support/index.vue b/pkg/harvester/pages/c/_cluster/support/index.vue
index 90e6bc037be..a31866c376a 100644
--- a/pkg/harvester/pages/c/_cluster/support/index.vue
+++ b/pkg/harvester/pages/c/_cluster/support/index.vue
@@ -7,6 +7,10 @@ import HarvesterSupportBundle from '../../../../dialog/HarvesterSupportBundle';
 import CommunityLinks from '@shell/components/CommunityLinks';
 import { SCHEMA } from '@shell/config/types';
 import { HCI } from '../../../../types';
+<<<<<<< HEAD
+=======
+import { DOC_LINKS } from '../../../../config/doc-links';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 export default {
   layout: 'default',
@@ -73,13 +77,26 @@ export default {
       const { host, params } = this.internalPrefix;
 
       return `https://${ host }/k8s/clusters/${ params.cluster }/api/v1/namespaces/longhorn-system/services/http:longhorn-frontend:80/proxy/#/dashboard`;
+<<<<<<< HEAD
     }
+=======
+    },
+
+    rancherIntegrationLink() {
+      return DOC_LINKS.RANCHER_INTEGRATION_URL;
+    },
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   },
 
   methods: {
     open() {
       this.$store.commit('harvester-common/toggleBundleModal', true);
+<<<<<<< HEAD
     }
+=======
+    },
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   }
 };
 </script>
@@ -132,7 +149,11 @@ export default {
               </h2>
               <div>
                 <p class="warning">
+<<<<<<< HEAD
                   <t k="harvester.support.internal.rancher.titleDescription" :raw="true" />
+=======
+                  <t k="harvester.support.internal.rancher.titleDescription" :raw="true" :url="rancherIntegrationLink" />
+>>>>>>> b5455bcb (fix: separate used/allocated units)
                 </p>
               </div>
             </div>
diff --git a/pkg/harvester/store/harvester-store/actions.ts b/pkg/harvester/store/harvester-store/actions.ts
index cadd41398a6..9544e7b4b11 100644
--- a/pkg/harvester/store/harvester-store/actions.ts
+++ b/pkg/harvester/store/harvester-store/actions.ts
@@ -90,6 +90,13 @@ export default {
       }, { root: true }),
     };
 
+<<<<<<< HEAD
+=======
+    if (getters['schemaFor'](HCI.RESOURCE_QUOTA)) {
+      hash.resourceQuota = dispatch('findAll', { type: HCI.RESOURCE_QUOTA });
+    }
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     if (getters['schemaFor'](HCI.UPGRADE)) {
       hash.upgrades = dispatch('findAll', { type: HCI.UPGRADE });
     }
@@ -101,6 +108,10 @@ export default {
     commit('updateNamespaces', {
       filters: [],
       all:     getters.filterNamespace(),
+<<<<<<< HEAD
+=======
+      getters
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     }, { root: true });
 
     // Solve compatibility with Rancher v2.6.x, fell remove these codes after not support v2.6.x
diff --git a/pkg/harvester/types.ts b/pkg/harvester/types.ts
index 6638cacc77d..45a34147699 100644
--- a/pkg/harvester/types.ts
+++ b/pkg/harvester/types.ts
@@ -11,6 +11,10 @@ export const HCI = {
   SETTING:            'harvesterhci.io.setting',
   UPGRADE:            'harvesterhci.io.upgrade',
   UPGRADE_LOG:        'harvesterhci.io.upgradelog',
+<<<<<<< HEAD
+=======
+  SCHEDULE_VM_BACKUP: 'harvesterhci.io.schedulevmbackup',
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   BACKUP:             'harvesterhci.io.virtualmachinebackup',
   RESTORE:            'harvesterhci.io.virtualmachinerestore',
   NODE_NETWORK:       'network.harvesterhci.io.nodenetwork',
@@ -31,12 +35,21 @@ export const HCI = {
   FLOW:               'harvesterhci.io.logging.flow',
   OUTPUT:             'harvesterhci.io.logging.output',
   STORAGE:            'harvesterhci.io.storage',
+<<<<<<< HEAD
+=======
+  RESOURCE_QUOTA:     'harvesterhci.io.resourcequota',
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   KSTUNED:            'node.harvesterhci.io.ksmtuned',
   PCI_DEVICE:         'devices.harvesterhci.io.pcidevice',
   PCI_CLAIM:          'devices.harvesterhci.io.pcideviceclaim',
   SR_IOV:             'devices.harvesterhci.io.sriovnetworkdevice',
   VGPU_DEVICE:        'devices.harvesterhci.io.vgpudevice',
   SR_IOVGPU_DEVICE:   'devices.harvesterhci.io.sriovgpudevice',
+<<<<<<< HEAD
+=======
+  USB_DEVICE:         'devices.harvesterhci.io.usbdevice',
+  USB_CLAIM:          'devices.harvesterhci.io.usbdeviceclaim',
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   VLAN_CONFIG:        'network.harvesterhci.io.vlanconfig',
   VLAN_STATUS:        'network.harvesterhci.io.vlanstatus',
   ADD_ONS:            'harvesterhci.io.addon',
@@ -46,6 +59,10 @@ export const HCI = {
   LB:                 'loadbalancer.harvesterhci.io.loadbalancer',
   IP_POOL:            'loadbalancer.harvesterhci.io.ippool',
   HARVESTER_CONFIG:   'rke-machine-config.cattle.io.harvesterconfig',
+<<<<<<< HEAD
+=======
+  LVM_VOLUME_GROUP:   'harvesterhci.io.lvmvolumegroup'
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 };
 
 export const VOLUME_SNAPSHOT = 'snapshot.storage.k8s.io.volumesnapshot';
diff --git a/pkg/harvester/utils/cron.js b/pkg/harvester/utils/cron.js
new file mode 100644
index 00000000000..67f883cd143
--- /dev/null
+++ b/pkg/harvester/utils/cron.js
@@ -0,0 +1,11 @@
+import cronstrue from 'cronstrue';
+
+export function isCronValid(schedule = '') {
+  try {
+    const hint = cronstrue.toString(schedule);
+
+    return !!hint;
+  } catch (e) {
+    return false;
+  }
+}
diff --git a/pkg/harvester/validators/vm.js b/pkg/harvester/validators/vm.js
index c1ded608ea0..19e5939ce57 100644
--- a/pkg/harvester/validators/vm.js
+++ b/pkg/harvester/validators/vm.js
@@ -87,7 +87,11 @@ export function vmDisks(spec, getters, errors, validatorArgs, displayKey, value)
         errors.push(getters['i18n/t']('harvester.validation.generic.tabError', { prefix, message }));
       }
 
+<<<<<<< HEAD
       if (typeValue?.spec?.resources?.requests?.storage && !/^([1-9][0-9]{0,8})[a-zA-Z]+$/.test(typeValue?.spec?.resources?.requests?.storage)) {
+=======
+      if (typeValue?.spec?.resources?.requests?.storage && !/^([0-9][0-9]{0,8})[a-zA-Z]+$/.test(typeValue?.spec?.resources?.requests?.storage)) {
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         const message = getters['i18n/t']('harvester.validation.generic.maximumSize', { max: '999999999 GiB' });
 
         errors.push(getters['i18n/t']('harvester.validation.generic.tabError', { prefix, message }));
diff --git a/pkg/harvester/validators/volume.js b/pkg/harvester/validators/volume.js
index 24c885bf830..5a64d3a65a8 100644
--- a/pkg/harvester/validators/volume.js
+++ b/pkg/harvester/validators/volume.js
@@ -1,5 +1,15 @@
 export function volumeSize(size, getters, errors, validatorArgs, displayKey, value) {
+<<<<<<< HEAD
   if (!/^([1-9][0-9]{0,8})[a-zA-Z]+$/.test(size)) {
+=======
+  if (!size) {
+    const key = getters['i18n/t']('harvester.volume.size');
+
+    errors.push(getters['i18n/t']('validation.required', { key }));
+  }
+
+  if (size && !/^([0-9][0-9]{0,8})[a-zA-Z]+$/.test(size)) {
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     const message = getters['i18n/t']('harvester.validation.generic.maximumSize', { max: '999999999 GiB' });
 
     errors.push(message);
diff --git a/pkg/rancher-components/package.json b/pkg/rancher-components/package.json
index d31e73d2955..56767fc5832 100644
--- a/pkg/rancher-components/package.json
+++ b/pkg/rancher-components/package.json
@@ -32,8 +32,13 @@
     "@vue/test-utils": "1.2.1",
     "babel-eslint": "10.1.0",
     "core-js": "3.25.3",
+<<<<<<< HEAD
     "cron-validator": "1.2.0",
     "cronstrue": "1.95.0",
+=======
+    "cron-validator": "1.3.1",
+    "cronstrue": "2.50.0",
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     "eslint": "7.32.0",
     "eslint-plugin-import": "2.23.4",
     "eslint-plugin-node": "11.1.0",
diff --git a/pkg/rancher-components/src/components/Form/LabeledInput/LabeledInput.vue b/pkg/rancher-components/src/components/Form/LabeledInput/LabeledInput.vue
index c4bd59177ac..f2223499bd8 100644
--- a/pkg/rancher-components/src/components/Form/LabeledInput/LabeledInput.vue
+++ b/pkg/rancher-components/src/components/Form/LabeledInput/LabeledInput.vue
@@ -144,11 +144,24 @@ export default (
       if (this.type !== 'cron' || !this.value) {
         return;
       }
+<<<<<<< HEAD
       if (!isValidCron(this.value)) {
         return this.t('generic.invalidCron');
       }
       try {
         const hint = cronstrue.toString(this.value);
+=======
+      // refer https://github.com/GuillaumeRochat/cron-validator#readme
+      if (!isValidCron(this.value, {
+        alias:              true,
+        allowBlankDay:      true,
+        allowSevenAsSunday: true,
+      })) {
+        return this.t('generic.invalidCron');
+      }
+      try {
+        const hint = cronstrue.toString(this.value, { verbose: true });
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
         return hint;
       } catch (e) {
diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index 3badc7a46e3..c37852b93fa 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -101,7 +101,11 @@ generic:
 
   deprecated: Deprecated
   placeholder: "e.g. {text}"
+<<<<<<< HEAD
   moreInfo: More Info
+=======
+  moreInfo: More Information
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   selectors:
     label: Selector
     matchingResources:
@@ -195,7 +199,11 @@ nav:
     restoreCards: Restore hidden cards
   userMenu:
     preferences: Preferences
+<<<<<<< HEAD
     accountAndKeys: Account & API Keys
+=======
+    accountAndKeys: Account and API Keys
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     logOut: Log Out
   failWhale:
     reload: Reload
@@ -203,7 +211,11 @@ nav:
 
 product:
   apps: Apps
+<<<<<<< HEAD
   auth: Users & Authentication
+=======
+  auth: Users and Authentication
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   backup: Rancher Backups
   cis: CIS Benchmark
   ecm: Cluster Manager
@@ -337,17 +349,29 @@ accountAndKeys:
       accessKey: Access Key
       secretKey: Secret Key
       bearerToken: Bearer Token
+<<<<<<< HEAD
       saveWarning: Save the info above! This is the only time you'll be able to see it. If you lose it, you'll need to create a new API key.
       keyCreated: A new API Key has been created
       bearerTokenTip: "Access Key and Secret Key can be sent as the username and password for HTTP Basic auth to authorize requests. You can also combine them to use as a Bearer token:"
       ttlLimitedWarning: The Expiry time for this API Key was reduced due to system configuration
+=======
+      saveWarning: Save the above information! This is the only time you will be able to see it. If you lose it, you will need to create a new API key.
+      keyCreated: A new API key has been created
+      bearerTokenTip: "Access Key and Secret Key can be sent as the username and password for HTTP basic authentication to authorize requests. You can also combine them to use as a Bearer token:"
+      ttlLimitedWarning: The Expiry time for this API key was reduced due to system configuration
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 addClusterMemberDialog:
   title: Add Cluster Member
 
 addonConfigConfirmation:
+<<<<<<< HEAD
   title: Add-On Config Reset
   body: Changing the Kubernetes Version can reset the Add-On Config values. You should check that the values are as expected before continuing.
+=======
+  title: Add-on Configuration Reset
+  body: Changing the Kubernetes Version can reset the add-on configuration values. Confirm that the values are as expected before continuing.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 addProjectMemberDialog:
   title: Add Project Member
@@ -355,11 +379,19 @@ addProjectMemberDialog:
 authConfig:
   accessMode:
     label: 'Configure who should be able to login and use {vendor}'
+<<<<<<< HEAD
     required: Restrict access to only the authorized users & groups
     restricted: 'Allow members of clusters and projects, plus authorized users & groups'
     unrestricted: Allow any valid user
   allowedPrincipalIds:
     title: Authorized Users & Groups
+=======
+    required: Restrict access to only the authorized users and groups
+    restricted: 'Allow members of clusters and projects, plus authorized users and groups'
+    unrestricted: Allow any valid user
+  allowedPrincipalIds:
+    title: Authorized Users and Groups
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   associatedWarning: 'Note: The {provider} user you authenticate as will be associated as an alternate way to login to the {vendor} user you are currently logged in as <code>{username}</code>; all the global permissions, project, and cluster role bindings of this {vendor} user will also apply to the {provider} user.'
   github:
     clientId:
@@ -384,7 +416,11 @@ authConfig:
         3: <li>Click the "New OAuth App" button.</li>
       suffix:
         1: <li>Click "Register application"</li>
+<<<<<<< HEAD
         2: <li>Copy and paste the Client ID and Client Secret of your newly created OAuth app into the fields below</li>
+=======
+        2: <li>Copy and paste the client ID and client secret of your newly created OAuth app into the fields below</li>
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     host:
       label: GitHub Enterprise Host
       placeholder: e.g. github.mycompany.example
@@ -408,7 +444,11 @@ authConfig:
       1:
         title: 'Click <a href="https://console.developers.google.com/apis/credentials" target="_blank" rel="noopener noreferrer nofollow">here</a> to open applications settings in a new window'
         body:
+<<<<<<< HEAD
          1: Login to your account. Navigate to "APIs & Services" and then select "OAuth consent screen".
+=======
+         1: Login to your account. Navigate to "APIs and Services" and then select "OAuth consent screen".
+>>>>>>> b5455bcb (fix: separate used/allocated units)
          2: 'Authorized domains:'
          3: 'Application homepage link: '
          4: 'Under Scopes for Google APIs, enable "email", "profile", and "openid".'
@@ -417,7 +457,11 @@ authConfig:
       2:
         title: 'Navigate to the "Credentials" tab to create your OAuth client ID'
         body:
+<<<<<<< HEAD
           1: 'Select the "Create Credentials" dropdown, and select "OAuth clientID", then select "Web application".'
+=======
+          1: 'Select the "Create Credentials" drop-down, and select "OAuth clientID", then select "Web application".'
+>>>>>>> b5455bcb (fix: separate used/allocated units)
           2: 'Authorized Javascript origins:'
           3: 'Authorized redirect URIs:'
           4: 'Click "Create", and then click on the "Download JSON" button.'
@@ -428,14 +472,22 @@ authConfig:
         body:
           1: Create a service account.
           2: Generate a key for the service account.
+<<<<<<< HEAD
           3: Add the service account as an OAuth client in your google domain.
+=======
+          3: Add the service account as an OAuth client in your Google domain.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   ldap:
     freeipa: Configure a FreeIPA server
     activedirectory: Configure an Active Directory account
     openldap: Configure an OpenLDAP server
     defaultLoginDomain:
       label: Default Login Domain
+<<<<<<< HEAD
       placeholder: eg mycompany
+=======
+      placeholder: eg, mycompany
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       hint: This domain will be used if a user logs in without specifying one.
     cert: Certificate
     disabledStatusBitmask: Disabled Status Bitmask
@@ -728,7 +780,11 @@ backupRestoreOperator:
   backupFilename: Backup Filename
   deleteTimeout:
     label: Delete Timeout
+<<<<<<< HEAD
     tip: Seconds to wait for a resource delete to succeed before removing finalizers to force deletion.
+=======
+    tip: Seconds to wait for a resource deletion to succeed before removing finalizers to force deletion.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   deployment:
     rancherNamespace: Rancher ResourceSet Namespace
     size: Size
@@ -745,6 +801,7 @@ backupRestoreOperator:
       storageClass:
         label: Storage Class
       tip: 'Configure a storage location where all backups are saved by default. You will have the option to override this with each backup, but will be limited to using an S3-compatible object store.'
+<<<<<<< HEAD
       warning: 'This {type} does not have its reclaim policy set to "Retain".  Your backups may be lost if the volume is changed or becomes unbound.'
   encryption: Encryption
   encryptionConfigName:
@@ -753,6 +810,16 @@ backupRestoreOperator:
     options:
       none: Store the contents of the backup unencrypted
       secret: 'Encrypt backups using an <a target="_blank" rel="noopener noreferrer nofollow" href="https://kubernetes.io/docs/tasks/administer-cluster/encrypt-data/#understanding-the-encryption-at-rest-configuration">Encryption Config Secret</a> (Recommended)'
+=======
+      warning: 'This {type} does not have its reclaim policy set to "Retain". Your backups may be lost if the volume is changed or becomes unbound.'
+  encryption: Encryption
+  encryptionConfigName:
+    backuptip: 'Any secret in the <code>cattle-resource-system</code> namespace that has an <code>encryption-provider-config.yaml</code> key. <br/>The contents of this file are necessary to perform a restore from this backup, and are not stored by Rancher Backup.'
+    label: Encryption Configuration Secret
+    options:
+      none: Store the contents of the backup unencrypted
+      secret: 'Encrypt backups using an <a target="_blank" rel="noopener noreferrer nofollow" href="https://kubernetes.io/docs/tasks/administer-cluster/encrypt-data/#understanding-the-encryption-at-rest-configuration">Encryption Configuration Secret</a> (Recommended)'
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     restoretip: 'If the backup was performed with encryption enabled, a secret containing the same encryption-provider-config should be used during restore.'
     warning: 'The contents of this file are necessary to perform a restore from this backup, and are not stored by Rancher Backup.'
   lastBackup: Last Backup
@@ -852,9 +919,15 @@ catalog:
     versionWindowsIncompatible: Linux only version
     header: Charts
     featuredCharts: Featured Charts
+<<<<<<< HEAD
     noCharts: 'There are no charts available, have you added any repos?'
     noWindows: Your repos do not contain any charts capable of being deployed on a cluster with Windows nodes.
     noWindowsAndLinux: Your repos do not contain any charts capable of being deployed on a cluster with both Windows and Linux worker nodes.
+=======
+    noCharts: 'There are no charts available, have you added any repositories?'
+    noWindows: Your repositories do not contain any charts capable of being deployed on a cluster with Windows nodes.
+    noWindowsAndLinux: Your repositories do not contain any charts capable of being deployed on a cluster with both Windows and Linux worker nodes.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     operatingSystems:
       all: All Operating Systems
       linux: Linux
@@ -863,7 +936,11 @@ catalog:
   install:
     action:
       goToUpgrade: Edit/Upgrade
+<<<<<<< HEAD
     appReadmeMissing: This chart doesn't have any additional chart information.
+=======
+    appReadmeMissing: This chart does not have any additional chart information.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     appReadmeTitle: Chart Information (Helm README)
     chart: Chart
     error:
@@ -872,12 +949,21 @@ catalog:
       insufficientCpu: 'This chart requires {need, number} CPU cores, but the cluster only has {have, number} available.'
       insufficientMemory: 'This chart requires {need} of memory, but the cluster only has {have} available.'
       legacy:
+<<<<<<< HEAD
         label: This is a {legacyType} App and it cannot be modified here
         enableLegacy:
           prompt: You will need to enable Legacy Features to edit this App
           goto: Go to Feature Flag settings
         navigate: Navigate to Legacy Apps
         mcmNotSupported: Legacy Multi-cluster Apps can not be managed through this UI
+=======
+        label: This is a {legacyType} application and it cannot be modified here
+        enableLegacy:
+          prompt: You will need to enable Legacy Features to edit this application
+          goto: Go to Feature Flag settings
+        navigate: Navigate to Legacy Applications
+        mcmNotSupported: Legacy Multi-cluster Applications can not be managed through this UI
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         category:
           legacy: Legacy
           mcm: Multi-cluster
@@ -889,8 +975,13 @@ catalog:
       atomic: Atomic
       description:
         label: Description
+<<<<<<< HEAD
         placeholder: e.g. Purpose of helm command
       cleanupOnFail: Cleanup on Failure
+=======
+        placeholder: e.g. Purpose of Helm command
+      cleanupOnFail: Clean up on Failure
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       crds: Apply custom resource definitions
       dryRun: Dry Run
       force: Force
@@ -913,7 +1004,11 @@ catalog:
           }
       wait: Wait
     namespaceIsInProject: "This chart's target namespace, <code>{namespace}</code>, already exists and cannot be added to a different project."
+<<<<<<< HEAD
     project: Install into Project
+=======
+    project: Install Into Project
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     section:
       chartOptions: Edit Options
       valuesYaml: Edit YAML
@@ -931,8 +1026,13 @@ catalog:
           } the {existing, select,
             true { app}
             false { chart}
+<<<<<<< HEAD
           }. Start by setting some basic information used by {vendor} to manage the App.
         nsCreationDescription: "To install the app into a new namespace enter it's name in the Namespace field and select it."
+=======
+          }. Start by setting some basic information used by {vendor} to manage the application.
+        nsCreationDescription: "To install the application into a new namespace, enter the name in the Namespace field and select it."
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         createNamespace: "Namespace <code>{namespace}</code> will be created."
       clusterTplVersion:
         label: Version
@@ -940,6 +1040,7 @@ catalog:
         description: Select a version of the Cluster Template
       clusterTplValues:
         label: Values
+<<<<<<< HEAD
         subtext: Change how the Cluster is defined
         description: Configure Values used by Helm that help define the Cluster.
       helmValues:
@@ -953,6 +1054,21 @@ catalog:
         checkbox: Customize Helm options before install
         label: Helm Options
         subtext: Change how the app is deployed
+=======
+        subtext: Change how the cluster is defined
+        description: Configure Values used by Helm that help define the cluster.
+      helmValues:
+        label: Values
+        subtext: Change how the application works
+        description: Configure values used by Helm that help define the application.
+        chartInfo:
+          button: View Chart Information
+          label: Chart Information
+      helmCli:
+        checkbox: Customize Helm options before installation
+        label: Helm Options
+        subtext: Change how the application is deployed
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         description: Supply additional deployment options
     version: Version
     versions:
@@ -971,7 +1087,11 @@ catalog:
     gitBranch:
       label: Git Branch
       placeholder: e.g. master
+<<<<<<< HEAD
       defaultMessage: 'Will default to "master" if left blank'
+=======
+      defaultMessage: 'The branch will default to "master" if left blank'
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     gitRepo:
       label: Git Repo URL
       placeholder: 'e.g. https://github.com/your-company/charts.git'
@@ -1103,7 +1223,11 @@ cluster:
     rke2-multus: Multus Configuration
   agentEnvVars:
     label: Agent Environment
+<<<<<<< HEAD
     detail: Add additional environment variables to the agent container.  This is most commonly useful for configuring a HTTP proxy.
+=======
+    detail: Add additional environment variables to the agent container. This is most commonly useful for configuring a HTTP proxy.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     keyLabel: Variable Name
   cloudProvider:
     aws:
@@ -1116,7 +1240,11 @@ cluster:
       label: Google
     rancher-vsphere:
       label: vSphere
+<<<<<<< HEAD
       note: '<b>Important:</b> Configure the vSphere Cloud Provider and Storage Provider options in the Add-On Config tab.'
+=======
+      note: '<b>Important:</b> Configure the vSphere Cloud Provider and Storage Provider options in the Add-on Configuration tab.'
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     harvester:
       label: Harvester
   copyConfig: Copy KubeConfig to Clipboard
@@ -1124,10 +1252,17 @@ cluster:
   custom:
     nodeRole:
       label: Node Role
+<<<<<<< HEAD
       detail: Choose what roles the node will have in the cluster.  The cluster needs to have at least one node with each role.
     advanced:
       label: Advanced
       detail: Additional control over how the node will be registered.  These values will often need to be different for each node registered.
+=======
+      detail: Choose what roles the node will have in the cluster. The cluster needs to have at least one node with each role.
+    advanced:
+      label: Advanced
+      detail: Additional control over how the node will be registered. These values will often need to be different for each node registered.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       nodeName: Node Name
       publicIp: Node Public IP
       privateIp: Node Private IP
@@ -1140,14 +1275,23 @@ cluster:
       windowsDetail: Run this command in PowerShell on each of the existing Windows machines you want to register. Windows nodes can only be workers.
       windowsNotReady: The cluster must be up and running with Linux etcd, control plane, and worker nodes before the registration command for adding Windows workers will display.
       windowsWarning: Workload pods, including some deployed by Rancher charts, will be scheduled on both Linux and Windows nodes by default. Edit NodeSelector in the chart to direct them to be placed onto a compatible node.
+<<<<<<< HEAD
       windowsDeprecatedForRKE1: Windows support is being deprecated for RKE1. We suggest migrating to RKE2.
+=======
+      windowsDeprecatedForRKE1: Windows support is being deprecated for RKE1 and RKE1 is soon to be deprecrated. Please migrate to RKE2.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       insecure: "Insecure: Select this to skip TLS verification if your server has a self-signed certificate."
   credential:
     banner:
       createCredential: |-
         {length, plural,
+<<<<<<< HEAD
           =0 {First you'll need to create a credential to talk to the cloud provider}
           other {Ok, Let's create a new credential}
+=======
+          =0 {First, you will need to create a credential to talk to the cloud provider}
+          other {Ok, start to create a new credential}
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         }
     selectExisting:
       label: Select Existing
@@ -1160,7 +1304,11 @@ cluster:
         label: Access Key
         placeholder: Your AWS Access Key
       defaultRegion:
+<<<<<<< HEAD
         help: The default region to use when creating clusters.  Also contacted to verify that this credential works.
+=======
+        help: The default region to use when creating clusters. Also contacted to verify that this credential works.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         label: Default Region
       secretKey:
         label: Secret Key
@@ -1265,7 +1413,11 @@ cluster:
         volume: Volume
         imageVolume: Image Volume
         addVolume: Add Volume
+<<<<<<< HEAD
         addVMImage: Add VM Image
+=======
+        addVMImage: Add Virtual Machine Image
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         storageClass: Storage Class
       sshUser: SSH User
       userData:
@@ -1281,9 +1433,15 @@ cluster:
       installGuestAgent: Install guest agent
   description:
     label: Cluster Description
+<<<<<<< HEAD
     placeholder: Any text you want that better describes this cluster
   harvester:
     importNotice: Import Harvester Clusters via
+=======
+    placeholder: Any text to describe this cluster
+  harvester:
+    importNotice: Import Harvester Clusters Via
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     warning:
       label: This is a Harvester Cluster - enable the Harvester feature flag to manage it
       state: Warning
@@ -1316,11 +1474,19 @@ cluster:
       sshUser:
         placeholder: e.g. ubuntu
         toolTip: SSH user to login with the selected OS image.
+<<<<<<< HEAD
   haveOneOwner: There must be at least one member with the Owner role.
   import:
     warningBanner: 'You should not import a cluster which has already been connected to another instance of Rancher as it will lead to data corruption.'
     commandInstructions: 'Run the <code>kubectl</code> command below on an existing Kubernetes cluster running a supported Kubernetes version to import it into {vendor}:'
     commandInstructionsInsecure: 'If you get a &quot;certificate signed by unknown authority&quot; error, your {vendor} installation has a self-signed or untrusted SSL certificate.  Run the command below instead to bypass the certificate verification:'
+=======
+  haveOneOwner: There must be at least one member with the owner role.
+  import:
+    warningBanner: 'You should not import a cluster which has already been connected to another instance of Rancher as it will lead to data corruption.'
+    commandInstructions: 'Run the <code>kubectl</code> command below on an existing Kubernetes cluster running a supported Kubernetes version to import it into {vendor}:'
+    commandInstructionsInsecure: 'If you get a &quot;certificate signed by unknown authority&quot; error, your {vendor} installation has a self-signed or untrusted SSL certificate. Run the command below instead to bypass the certificate verification:'
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     clusterRoleBindingInstructions: 'If you get permission errors creating some of the resources, your user may not have the <code>cluster-admin</code> role.  Use this command to apply it:'
     clusterRoleBindingCommand: 'kubectl create clusterrolebinding cluster-admin-binding --clusterrole cluster-admin --user <your username from your kubeconfig>'
   explore: Explore
@@ -1333,7 +1499,11 @@ cluster:
     deprecated: (deprecated)
     deprecatedPatches: Show deprecated Kubernetes patch versions
     deprecatedPatchWarning: We recommend using the latest patch version for each minor Kubernetes version. Deprecated patch versions can be useful for migration purposes.
+<<<<<<< HEAD
   toolsTip: Use the new Cluster Tools to manage and install Monitoring, Logging and other tools
+=======
+  toolsTip: Use the new cluster tools to manage and install monitoring, logging and other tools
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   legacyWarning: The legacy feature flag is enabled and not all legacy features are supported in Kubernetes 1.21+.
   log:
     connecting: Connecting…
@@ -1411,6 +1581,7 @@ cluster:
         network: Network
         disks: Disks
       size:
+<<<<<<< HEAD
         label: VM Size
         tooltip: When accelerated networking is enabled, not all sizes are available.
         supportsAcceleratedNetworking: Sizes that Support Accelerated Networking
@@ -1419,6 +1590,16 @@ cluster:
         regionDoesNotSupportAzs: Availability zones are not supported in the selected region. Please select a different region or use an availability set instead.
         regionSupportsAzsButNotThisSize: The selected region does not support availability zones for the selected VM size. Please select a different region or VM size.
         selectedSizeAcceleratedNetworkingWarning: The selected VM size does not support accelerated networking. Please select another VM size or disable accelerated networking.
+=======
+        label: Virtual Machine Size
+        tooltip: When accelerated networking is enabled, not all sizes are available.
+        supportsAcceleratedNetworking: Sizes That Support Accelerated Networking
+        doesNotSupportAcceleratedNetworking: Sizes Without Accelerated Networking
+        availabilityWarning: The selected virtual machine size is not available in the selected region.
+        regionDoesNotSupportAzs: Availability zones are not supported in the selected region. Please select a different region or use an availability set instead.
+        regionSupportsAzsButNotThisSize: The selected region does not support availability zones for the selected virtual machine size. Please select a different region or virtual machine size.
+        selectedSizeAcceleratedNetworkingWarning: The selected virtual machine size does not support accelerated networking. Please select another virtual machine size or disable accelerated networking.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       sshUser:
         label: SSH Username
       storageType:
@@ -1511,7 +1692,11 @@ cluster:
         folder: Folder
         host:
           label: Host
+<<<<<<< HEAD
           note: Specific host to create VM on (leave blank for standalone ESXi or for cluster with DRS)
+=======
+          note: Specific host to create virtual machine on (leave blank for standalone ESXi or for cluster with DRS)
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       instanceOptions:
         label: Instance Options
         description: Choose the size and OS of the virtual machine
@@ -1532,7 +1717,11 @@ cluster:
           label: Cloud Init
           placeholder: e.g. http://my_host/cloud-config.yml
           note: Cloud-init file or url to set in the guestinfo
+<<<<<<< HEAD
         cloudConfigYaml: Cloud Config YAML
+=======
+        cloudConfigYaml: Cloud Configuration YAML
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         os: Operating System
       tags:
         label: Tags
@@ -1608,7 +1797,11 @@ cluster:
       serverOs:
         label: OS
   addOns:
+<<<<<<< HEAD
     dependencyBanner: Add-On Configurations can vary between Kubernetes versions. Changing the Kubernetes version may reset the values below.
+=======
+    dependencyBanner: Add-on configurations can vary between Kubernetes versions. Changing the Kubernetes version may reset the values below.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     additionalManifest:
       title: Additional Manifest
       tooltip: 'Additional Kubernetes Manifest YAML to be applied to the cluster on startup.'
@@ -1627,14 +1820,20 @@ cluster:
       nodeAffinity: Node Affinity
     banners:
       advanced: These are advanced configuration options. Generally, they should be left as-is.
+<<<<<<< HEAD
       tolerations: Additional Pod Tolerations will be added to the default Tolerations applied by Rancher.
       limits: Pod Requests and Limits do not have a default configuration.
+=======
+      tolerations: Additional pod tolerations will be added to the default tolerations applied by Rancher.
+      limits: Pod requests and limits do not have a default configuration.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       windowsCompatibility: "We do not recommended removing the Node Affinity rule that prevents the <b>agent</b> from running on Windows nodes as this is not a supported configuration."
     affinity:
       default: Use default affinity rules defined by Rancher
       custom: Use custom affinity rules
   advanced:
     argInfo:
+<<<<<<< HEAD
       title: Additional Kubelet Args
       machineSelector:
         label: Add Machine Selector
@@ -1650,15 +1849,40 @@ cluster:
         kubeControllerManagerTitle: Additional Controller Manager Args
         kubeApiServerTitle: Additional API Server Args
         kubeSchedulerTitle: Additional Scheduler Args
+=======
+      title: Additional Kubelet Arguments
+      machineSelector:
+        label: Add Machine Selector
+        listLabel: Add Arguments
+        bannerLabel: 'Note: The last selector that matches wins and only arguments from it will be used. Arguments from other matches above will not combined together or merged.'
+        title: 'For machines with labels matching:'
+        subTitle: 'Use the Kubelet arguments:'
+        titleAlt:  |-
+          {count, plural,
+            =1 { For all machines, use the Kubelet arguments: }
+            other { For any machines, use the Kubelet arguments: }
+          }
+        kubeControllerManagerTitle: Additional Controller Manager Arguments
+        kubeApiServerTitle: Additional API Server Arguments
+        kubeSchedulerTitle: Additional Scheduler Arguments
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     agentArgs:
       label: Raise error if kernel parameters are different than the expected kubelet defaults
   banner:
     warning: 'This cluster contains a machineSelectorConfig which this form does not fully support; use the YAML editor to manage the full configuration.'
+<<<<<<< HEAD
     os: 'You are attemping to add a {newOS} worker node to a cluster with one or more {existingOS} worker nodes: some installed apps may need to be upgraded or removed.'
     rke2-k3-reprovisioning: 'Making changes to cluster configuration may result in nodes reprovisioning. For more information see the <a target="blank" href="{docsBase}/cluster-provisioning/rke-clusters/behavior-differences-between-rke1-and-rke2/" target="_blank" rel="noopener nofollow">documentation</a>.'
     desiredNodeGroupWarning: There are 0 nodes available to run the cluster agent. The cluster will not become active until at least one node is available.
     invalidPsps: You have one or more PodSecurityPolicy resource(s) in this cluster. Pod Security Policies are not available in Kubernetes v1.25 and will be automatically removed.
     haveArgInfo: Configuration information is not available for the selected Kubernetes version.  The options available in this screen will be limited, you may want to use the YAML editor.
+=======
+    os: 'You are attemping to add a {newOS} worker node to a cluster with one or more {existingOS} worker nodes: some installed applications may need to be upgraded or removed.'
+    rke2-k3-reprovisioning: 'Making changes to cluster configuration may result in nodes reprovisioning. For more information see the <a target="blank" href="{docsBase}/cluster-provisioning/rke-clusters/behavior-differences-between-rke1-and-rke2/" target="_blank" rel="noopener nofollow">documentation</a>.'
+    desiredNodeGroupWarning: There are 0 nodes available to run the cluster agent. The cluster will not become active until at least one node is available.
+    invalidPsps: You have one or more PodSecurityPolicy resource(s) in this cluster. Pod Security Policies are not available in Kubernetes v1.25 and will be automatically removed.
+    haveArgInfo: Configuration information is not available for the selected Kubernetes version. The options available in this screen will be limited, you may want to use the YAML editor.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     deprecatedPsp: Pod Security Policies are deprecated as of Kubernetes v1.21, and have been removed in Kubernetes v1.25.
     removedPsp: Pod Security Policies have been removed in Kubernetes v1.25, use Pod Security Admission instead.
   rkeTemplateUpgrade: Template revision {name} available for upgrade
@@ -1678,7 +1902,11 @@ cluster:
   machinePool:
     name:
       label: Pool Name
+<<<<<<< HEAD
       placeholder: A random one will be generated by default
+=======
+      placeholder: A random name is generated by default
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     nodeTotals:
       label:
         controlPlane: '{count} Control Plane'
@@ -1695,7 +1923,11 @@ cluster:
           {count, plural,
             =0 { A cluster needs at least one etcd node to be usable. }
             =1 { A cluster with only one etcd node is not fault-tolerant. }
+<<<<<<< HEAD
             =2 { Clusters should have an odd number of nodes.  A cluster with 2 etcd nodes is not fault-tolerant. }
+=======
+            =2 { Clusters should have an odd number of nodes. A cluster with 2 etcd nodes is not fault-tolerant. }
+>>>>>>> b5455bcb (fix: separate used/allocated units)
             =3 {}
             =4 { Clusters should have an odd number of nodes. }
             =5 {}
@@ -1731,7 +1963,11 @@ cluster:
       label: Auto Replace
       toolTip: If greater than 0, nodes that are unreachable for this duration will be automatically deleted and replaced.
       unit: "Seconds"
+<<<<<<< HEAD
   managementTimeout: The cluster to become available. It's possible the cluster was created. We suggest checking the clusters page before trying to create another.
+=======
+  managementTimeout: The cluster to become available. It is possible the cluster was created. We suggest checking the clusters page before trying to create another.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   memberRoles:
     removeMessage: 'Note: Removing a user will not remove their project permissions'
     addClusterMember:
@@ -1807,11 +2043,19 @@ cluster:
       harvester: '{tag}'
   providerGroup:
     create-custom1: Use existing nodes and create a cluster using RKE
+<<<<<<< HEAD
     create-custom2: Use existing nodes and create a cluster using RKE2/K3s
     create-kontainer: Create a cluster in a hosted Kubernetes provider
     register-kontainer: Register an existing cluster in a hosted Kubernetes provider
     create-rke1: Provision new nodes and create a cluster using RKE
     create-rke2: Provision new nodes and create a cluster using RKE2/K3s
+=======
+    create-custom2: Use existing nodes and create a cluster using RKE2 or K3s
+    create-kontainer: Create a cluster in a hosted Kubernetes provider
+    register-kontainer: Register an existing cluster in a hosted Kubernetes provider
+    create-rke1: Provision new nodes and create a cluster using RKE
+    create-rke2: Provision new nodes and create a cluster using RKE2 or K3s
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     create-template: Use a Catalog Template to create a cluster
     register-custom: Import any Kubernetes cluster
   rke2:
@@ -1835,7 +2079,11 @@ cluster:
       label: Container Network
     cloudProvider:
       label: Cloud Provider
+<<<<<<< HEAD
       header: Cloud Provider Config
+=======
+      header: Cloud Provider Configuration
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       defaultValue:
         label: Default - RKE2 Embedded
     security:
@@ -1867,8 +2115,13 @@ cluster:
       toolTip: "This can be either a fixed number of nodes (e.g. 1) at a time or a percentage (e.g. 10%)"
     drain:
       label: Drain Nodes
+<<<<<<< HEAD
       toolTip: Draining preemptively removes the pods on each node so there are no running workloads on the nodes being upgraded.  Upgrading without draining is faster and causes less shuffling around, but pods may still be restarted depending on the upgrade being performed.
     deleteEmptyDir: "By default, pods using emptyDir volumes will be deleted on upgrade. Operations reliant on emptyDir volumes persisting through the pod's lifecycle may be impacted."
+=======
+      toolTip: Draining preemptively removes the pods on each node so there are no running workloads on the nodes being upgraded. Upgrading without draining is faster and causes less shuffling around, but pods may still be restarted depending on the upgrade being performed.
+    deleteEmptyDir: "By default, pods using emptyDir volumes will be deleted on upgrade. Operations reliant on emptyDir volumes persisting through the pods lifecycle may be impacted."
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     truncateHostnames: Truncate hostnames to 15 characters for NetBIOS compatibility.
     address:
       tooltip: Cluster networking values cannot be changed after the cluster is created.
@@ -1912,7 +2165,11 @@ cluster:
       servicelb: 'Klipper Service LB'
       traefik: 'Traefik Ingress'
   selectCredential:
+<<<<<<< HEAD
     genericDescription: "{vendor} has no built-in support for this driver.  We've taken a guess, but consult the driver's documentation for the fields required for authentication."
+=======
+    genericDescription: "{vendor} has no built-in support for this driver. We've taken a guess, but consult the driver's documentation for the fields required for authentication."
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   snapshot:
     successTitle: Snapshot Started
     errorTitle: "Error Snapshotting {name}"
@@ -1930,7 +2187,11 @@ cluster:
       s3: s3
   tabs:
     ace: Authorized Endpoint
+<<<<<<< HEAD
     addons: Add-On Config
+=======
+    addons: Add-on Configuration
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     advanced: Advanced
     agentEnv: Agent Environment Vars
     basic: Basics
@@ -1954,7 +2215,11 @@ cluster:
     v1: RKE1
     v2: RKE2/K3s
   validation:
+<<<<<<< HEAD
     iamInstanceProfileName: If the Amazon cloud provider is selected the "IAM Instance Profile Name" must be defined for each Machine Pool
+=======
+    iamInstanceProfileName: If the Amazon cloud provider is selected the "IAM Instance Profile Name" must be defined for each machine pool
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 clusterIndexPage:
   hardwareResourceGauge:
@@ -2007,7 +2272,11 @@ configmap:
   tabs:
     data:
       label: Data
+<<<<<<< HEAD
       protip: Use this area for anything that's UTF-8 text data
+=======
+      protip: Use this area for anything that contains UTF-8 text data
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     binaryData:
       label: Binary Data
 
@@ -2127,7 +2396,11 @@ fleet:
       notReady: Not Ready
       waitApplied: Wait Applied
   gitRepo:
+<<<<<<< HEAD
     createLocalBanner: When deploying a Git Repo to the Local workspace you are unable to target any specific Cluster or Cluster Groups
+=======
+    createLocalBanner: When deploying a Git Repo to the local workspace you are unable to target any specific cluster or cluster groups
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     tabs:
       resources: Resources
       unready: Non-Ready
@@ -2142,7 +2415,11 @@ fleet:
       label: Paths
       placeholder: e.g. /directory/in/your/repo
       addLabel: Add Path
+<<<<<<< HEAD
       empty: The root of the repo is used by default.  To use one or more different directories, add them here.
+=======
+      empty: The root of the repo is used by default. To use one or more different directories, add it here.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     repo:
       label: Repository URL
       placeholder: e.g. https://github.com/rancher/fleet-examples.git or git@github.com:rancher/fleet-examples.git
@@ -2228,7 +2505,11 @@ fleet:
   workspaces:
     tabs:
       restrictions: Allowed Target Namespaces
+<<<<<<< HEAD
     timeout: Workspace creation timeout. It's possible the workspace was created. We suggest checking the workspace page before trying to create another.
+=======
+    timeout: Workspace creation timeout. It is possible the workspace was created. We suggest checking the workspace page before trying to create another.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   restrictions:
     addTitle: 'allowedTargetNamespaces'
     addLabel: Add
@@ -2401,10 +2682,17 @@ hpa:
     cpu: CPU
     memory: Memory
   warnings:
+<<<<<<< HEAD
     custom: In order to use custom metrics with HPA, you need to deploy the custom metrics server such as prometheus adapter.
     external: In order to use external metrics with HPA, you need to deploy the external metrics server such as prometheus adapter.
     noMetric: In order to use resource metrics with HPA, you need to deploy the metrics server.
     resource: The selected target reference does not have the correct resource requests on the spec. Without this the HPA metric will have no effect.
+=======
+    custom: In order to use custom metrics with HPA, you need to deploy the custom metrics server such as Prometheus adapter.
+    external: In order to use external metrics with HPA, you need to deploy the external metrics server such as Prometheus adapter.
+    noMetric: In order to use resource metrics with HPA, you need to deploy the metrics server.
+    resource: The selected target reference does not have the correct resource requests on the spec. Without this, the HPA metric will have no effect.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   workloadTab:
     current: Current Replicas
     last: Last Scale Time
@@ -2423,7 +2711,11 @@ import:
     }
 
 ingress:
+<<<<<<< HEAD
   description: Ingresses route incoming traffic from the internet to Services within the cluster based on the hostname and path specified in the request. You can expose multiple Services on the same external IP address and port.
+=======
+  description: Ingresses route incoming traffic from the internet to services within the cluster based on the hostname and path specified in the request. You can expose multiple services on the same external IP address and port.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   certificates:
     addCertificate: Add Certificate
     addHost: Add Host
@@ -2450,7 +2742,11 @@ ingress:
     targetService:
       label: Target Service
       doesntExist: The selected service does not exist
+<<<<<<< HEAD
       required: Target Service is required
+=======
+      required: Target service is required
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     warning: "Warning: Default backend is used globally for the entire cluster."
   ingressClass:
     label: Ingress Class
@@ -2476,7 +2772,11 @@ ingress:
       placeholder: e.g. example.com
     target:
       label: Target Service
+<<<<<<< HEAD
       tooltip: If none of the Services in this dropdown select the Pods that you need to expose, you will need to create a Service that selects those Pods first.
+=======
+      tooltip: If none of the services in this drop-down select the pods that you need to expose, you will need to create a service that selects those pods first.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       doesntExist: The selected service does not exist
     title: Rules
   rulesAndCertificates:
@@ -2484,7 +2784,11 @@ ingress:
     defaultCertificate: default
   target:
     default: Default
+<<<<<<< HEAD
   rulesOrBackendSpecified: Either Default Backend or Rules must be specified
+=======
+  rulesOrBackendSpecified: Either the default backend or rules must be specified
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 internalExternalIP:
   none: None
@@ -2496,7 +2800,11 @@ istio:
       description: 'Visualization of services within a service mesh and how they are connected. For Kiali to display data, you need Prometheus installed. If you need a monitoring solution, install <a tabindex="0" href="{link}">{vendor} monitoring</a>.'
     jaeger:
       label: Jaeger
+<<<<<<< HEAD
       description: Monitor and Troubleshoot microservices-based distributed systems.
+=======
+      description: Monitor and troubleshoot microservices-based distributed systems.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     disabled: '{app} is not installed'
   cni: Enable CNI
   customOverlayFile:
@@ -2588,7 +2896,11 @@ istio:
         help: Maximum number of HTTP1 /TCP connections to a destination host.
     outlierDetection:
       label: Outlier Detection
+<<<<<<< HEAD
       detail: Configure eviction of unhealthy hosts from the load balancing pool
+=======
+      detail: Configure eviction of unhealthy hosts from the load balancing pool.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       baseEjectionTime:
         label: Base Ejection Time
         placeholder: e.g. 30s
@@ -2613,7 +2925,11 @@ istio:
       name:
         label: Name
         placeholder: e.g. v1
+<<<<<<< HEAD
         error: Subset Name is required.
+=======
+        error: Subset name is required.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       labels:
         error: Please input at least one label for subset.
     tls:
@@ -2634,11 +2950,19 @@ istio:
       clientCertificate:
         label: Client Certificate
         placeholder: e.g. /etc/certs/myclientcert.pem
+<<<<<<< HEAD
         error: Client Certificate is required.
       privateKey:
         label: Private Key
         placeholder: e.g. /etc/certs/client_private_key.pem
         error: Private Key is required.
+=======
+        error: Client certificate is required.
+      privateKey:
+        label: Private Key
+        placeholder: e.g. /etc/certs/client_private_key.pem
+        error: Private key is required.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       caCertificates:
         label: CA Certificates
         placeholder: e.g. /etc/certs/rootcacerts.pem
@@ -2668,14 +2992,22 @@ istio:
 
 labels:
   addLabel: Add Label
+<<<<<<< HEAD
   addSetLabel: Add/Set Label
+=======
+  addSetLabel: Add or Set Label
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   addTag: Add Tag
   addTaint: Add Taint
   addAnnotation: Add Annotation
   labels:
     title: Labels
     description: Key/value pairs that are attached to objects which specify identifying attributes.
+<<<<<<< HEAD
     fleetClusterTooltip: Label changes are made to the Management Cluster and synchronized to the Fleet Cluster
+=======
+    fleetClusterTooltip: Label changes are made to the management cluster and synchronized to the Fleet cluster.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     show: Show System Label
     hide: Hide System Label
   annotations:
@@ -2726,7 +3058,11 @@ logging:
     noOutputsBanner: There are no cluster outputs in the selected namespace.
   flow:
     clusterOutputs:
+<<<<<<< HEAD
       doesntExistTooltip: This cluster output doesn't exist
+=======
+      doesntExistTooltip: This cluster output does not exist
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       label: Cluster Outputs
     matches:
       banner: Configure which container logs will be pulled from
@@ -2760,7 +3096,11 @@ logging:
     filters:
       label: Filters
     outputs:
+<<<<<<< HEAD
       doesntExistTooltip: This output doesn't exist
+=======
+      doesntExistTooltip: This output does not exist
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       sameNamespaceError: Output must reside in same namespace as the flow.
       label: Outputs
   install:
@@ -2874,7 +3214,11 @@ logging:
     overwriteExistingPath: Overwrite Existing Path
   kinesisStream:
     streamName: Stream Name
+<<<<<<< HEAD
     keyId: Key Id from Secret
+=======
+    keyId: Key ID from Secret
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     secretKey: Secret Key from Secret
   logdna:
     apiKey: API Key
@@ -2883,7 +3227,11 @@ logging:
   logz:
     url: URL
     port: Port
+<<<<<<< HEAD
     token: Api Token from Secret
+=======
+    token: API Token from Secret
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     enableCompression: Enable Compression
   newrelic:
     apiKey: API Key from Secret
@@ -2914,7 +3262,11 @@ logging:
       timekeyWait: Timekey Wait
       timekeyUseUTC: Timekey Use UTC
   s3:
+<<<<<<< HEAD
     keyId: Key Id from Secret
+=======
+    keyId: Key ID from Secret
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     secretKey: Secret Key from Secret
     endpoint: Endpoint
     bucket: Bucket
@@ -2933,7 +3285,11 @@ logging:
       configuration: Configuration
     tips:
       singleProvider: This output is configured with multiple providers. We currently only support a single provider per output. You can view or edit the YAML.
+<<<<<<< HEAD
       multipleProviders: This output is configured with providers we don't support yet. You can view or edit the YAML.
+=======
+      multipleProviders: This output is configured with providers we do not support yet. You can view or edit the YAML.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   outputProviders:
     elasticsearch: Elasticsearch
     opensearch: OpenSearch
@@ -3042,7 +3398,11 @@ members:
   clusterPermissions:
     noDescription: User created - no description
     label: Cluster Permissions
+<<<<<<< HEAD
     description: Controls what access users have to the Cluster
+=======
+    description: Controls what access users have to the cluster
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     createProjects: Create Projects
     manageClusterBackups: Manage Cluster Backups
     manageClusterCatalogs: Manage Cluster Catalogs
@@ -3056,10 +3416,17 @@ members:
     viewNodes: View Nodes
     owner:
       label: Owner
+<<<<<<< HEAD
       description: Owners have full control over the Cluster and all resources inside it.
     member:
       label: Member
       description: Members can manage the resources inside the Cluster but not change the Cluster itself.
+=======
+      description: Owners have full control over the cluster and all the resources inside it.
+    member:
+      label: Member
+      description: Members can manage the resources inside the cluster but not change the cluster itself.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     custom:
       label: Custom
       description: Choose individual roles for this user.
@@ -3079,16 +3446,24 @@ monitoring:
     readOnlyMany: ReadOnlyMany
   aggregateDefaultRoles:
     label: Aggregate to Default Kubernetes Roles
+<<<<<<< HEAD
     tip: 'Adds labels to the ClusterRoles deployed by the Monitoring chart to <a target="_blank" rel="noopener nofollow noreferrer" href="https://kubernetes.io/docs/reference/access-authn-authz/rbac/#aggregated-clusterroles"> aggregate to the corresponding default k8s admin, edit, and view ClusterRoles.</a>'
   alerting:
     config:
       label: Alert Manager Config
+=======
+    tip: 'Adds labels to the ClusterRoles deployed by the monitoring chart to <a target="_blank" rel="noopener nofollow noreferrer" href="https://kubernetes.io/docs/reference/access-authn-authz/rbac/#aggregated-clusterroles"> aggregate to the corresponding default Kubernetes administrator, edit, and view ClusterRoles.</a>'
+  alerting:
+    config:
+      label: Alert Manager Configuration
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     enable:
       label: Deploy Alertmanager
     secrets:
       additional:
         info: Secrets should be mounted at <pre class='inline-block m-0'>/etc/alertmanager/secrets/</pre>
         label: Additional Secrets
+<<<<<<< HEAD
       existing: Choose an existing config secret
       info: |
         <span class="text-bold">Create default config</span>: A Secret containing your Alertmanager Config will be created in the <pre class='inline-block m-0'>cattle-monitoring-system</pre> namespace on deploying this chart under the name <pre class='inline-block m-0'>alertmanager-rancher-monitoring-alertmanager</pre>. By default, this Secret will never be modified on an uninstall or upgrade of this chart. <br />
@@ -3098,6 +3473,17 @@ monitoring:
       new: Create default config
       radio:
         label: Config Secret
+=======
+      existing: Choose an existing configuration secret
+      info: |
+        <span class="text-bold">Create default configuration</span>: A Secret containing your Alertmanager configuration will be created in the <pre class='inline-block m-0'>cattle-monitoring-system</pre> namespace on deploying this chart under the name <pre class='inline-block m-0'>alertmanager-rancher-monitoring-alertmanager</pre>. By default, this secret will never be modified on an uninstall or upgrade of this chart. <br />
+        Once you have deployed this chart, edit the secret via the UI in order to add your custom notification configurations that will be used by Alertmanager to send alerts. <br /> <br />
+        <span class="text-bold">Choose an existing configuration secret</span>: You must specify a secret that exists in the <pre class='inline-block m-0'>cattle-monitoring-system</pre> namespace. If the namespace does not exist, you will not be able to select an existing secret.
+      label: Alertmanager Secret
+      new: Create default configuration
+      radio:
+        label: Configuration Secret
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     validation:
       duplicatedReceiverName: A receiver with the name {name} already exists.
     templates:
@@ -3170,7 +3556,11 @@ monitoring:
       adminApi: Admin API
       evaluation: Evaluation Interval
       ignoreNamespaceSelectors:
+<<<<<<< HEAD
         help: 'Ignoring Namespace Selectors allows Cluster Admins to limit teams from monitoring resources outside of namespaces they have permissions to but can break the functionality of Apps that rely on setting up Monitors that scrape targets across multiple namespaces, such as Istio.'
+=======
+        help: 'Ignoring Namespace Selectors allows cluster admins to limit teams from monitoring resources outside of namespaces they have permissions to but can break the functionality of applications that rely on setting up monitors that scrape targets across multiple namespaces, such as Istio.'
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         label: Namespace Selectors
         radio:
           enforced: 'Use: Monitors can access resources based on namespaces that match the namespace selector field'
@@ -3190,13 +3580,21 @@ monitoring:
       label: Persistent Storage for Prometheus
       mode: Access Mode
       selector: Selector
+<<<<<<< HEAD
       selectorWarning: 'If you are using a dynamic provisioner (e.g. Longhorn), no Selectors should be specified since a PVC with a non-empty selector can''t have a PV dynamically provisioned for it.'
+=======
+      selectorWarning: 'If you are using a dynamic provisioner (e.g. Longhorn), no selectors should be specified since a PVC with a non-empty selector cannot have a PV dynamically provisioned for it.'
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       size: Size
       volumeName: Volume Name
     title: Configure Prometheus
     warningInstalled: |
       Warning: Prometheus Operators are currently deployed. Deploying multiple Prometheus Operators onto one cluster is not currently supported. Please remove all other Prometheus Operator deployments from this cluster before trying to install this chart.
+<<<<<<< HEAD
       If you are migrating from an older version of {vendor} with Monitoring enabled, please disable Monitoring on this cluster completely before attempting to install this chart.
+=======
+      If you are migrating from an older version of {vendor} with monitoring enabled, please disable monitoring on this cluster completely before attempting to install this chart.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   receiver:
     addReceiver: Add Receiver
     fields:
@@ -3212,6 +3610,7 @@ monitoring:
       keyFilePath:
         label: Key File Path
         placeholder: e.g. ./key-file.pfx
+<<<<<<< HEAD
       secretsBanner: The file paths below must be referenced in <pre class="inline-block m-0 p-0 vertical-middle">alertmanager.alertmanagerSpec.secrets</pre> when deploying the Monitoring chart. For more information see our <a href="{docsBase}/monitoring-alerting/" target="_blank" rel="noopener noreferrer nofollow">documentation</a>.
   projectMonitoring:
     detail:
@@ -3222,6 +3621,18 @@ monitoring:
         message: Project Monitoring has not been configured for any projects
         canCreate: Get started by clicking Create to add monitoring to a project
         cannotCreate: Contact the admin to add project monitoring
+=======
+      secretsBanner: The file paths below must be referenced in <pre class="inline-block m-0 p-0 vertical-middle">alertmanager.alertmanagerSpec.secrets</pre> when deploying the monitoring chart. For more information see our <a href="{docsBase}/monitoring-alerting/" target="_blank" rel="noopener noreferrer nofollow">documentation</a>.
+  projectMonitoring:
+    detail:
+      error: "Unable to fetch dashboard values with status: "
+    list:
+      banner: Project monitoring configuration is stored in ProjectHelmChart resources
+      empty:
+        message: Project monitoring has not been configured for any projects
+        canCreate: Get started by clicking create to add monitoring to a project
+        cannotCreate: Contact the administrator to add project monitoring
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   route:
     label: Route
     fields:
@@ -3236,9 +3647,15 @@ monitoring:
   alertmanagerConfig:
     description: Routes and receivers for project alerting and cluster alerting are configured within AlertmanagerConfig resources.
     empty: Alerts have not been configured for any accessible namespaces.
+<<<<<<< HEAD
     getStarted: Get started by clicking Create to configure an alert.
     receiverTooltip: This route will direct alerts to the selected receiver, which must be defined in the same AlertmanagerConfig.
     deprecationWarning: The Route and Receiver resources are deprecated. Going forward, routes and receivers should not be managed as separate Kubernetes resources on this page. They should be configured as YAML fields in an AlertmanagerConfig resource.
+=======
+    getStarted: Get started by clicking create to configure an alert.
+    receiverTooltip: This route will direct alerts to the selected receiver, which must be defined in the same AlertmanagerConfig.
+    deprecationWarning: The route and receiver resources are deprecated. Going forward, routes and receivers should not be managed as separate Kubernetes resources on this page. They should be configured as YAML fields in an AlertmanagerConfig resource.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     routeInfo: This form supports configuring one route that directs traffic to a receiver. Alerts can be directed to more receiver(s) by configuring child routes in YAML.
     receiverFormNames:
       create: Create Receiver in AlertmanagerConfig
@@ -3273,19 +3690,28 @@ monitoring:
       warning2: <a target="blank" href="{docsBase}/monitoring-alerting/guides/migrating/" target='_blank' rel='noopener nofollow'>Learn more</a> about the migration steps to V2 Monitoring.
       promptDescription: <div class="mt-20 mb-20">You are attempting to uninstall V1 Monitoring. Please ensure you have read the migration steps.</div>
       success1: V1 monitoring successfully uninstalled.
+<<<<<<< HEAD
       success2: Press Next to continue
+=======
+      success2: Press next to continue
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   tabs:
     alerting: Alerting
     general: General
     grafana: Grafana
     prometheus: Prometheus
     projectMetrics: Project Metrics
+<<<<<<< HEAD
   v1Warning: 'Monitoring is currently deployed from Cluster Manager. If you are migrating from an older version of {vendor} with monitoring enabled, please disable monitoring in Cluster Manager before attempting to install the new {vendor} Monitoring chart in Cluster Explorer.'
+=======
+  v1Warning: 'Monitoring is currently deployed from cluster manager. If you are migrating from an older version of {vendor} with monitoring enabled, please disable monitoring in cluster manager before attempting to install the new {vendor} monitoring chart in cluster explorer.'
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 monitoringReceiver:
   addButton: Add {type}
   custom:
     label: Custom
+<<<<<<< HEAD
     title: Custom Config
     info: The YAML provided here will be directly appended to your receiver within the Alertmanager Config Secret.
   email:
@@ -3308,6 +3734,30 @@ monitoringReceiver:
     urlTooltip: For some webhooks this a url that points to the service DNS
     modifyNamespace: If <pre class="inline-block m-0 p-0 vertical-middle">rancher-alerting-drivers</pre> default values were changed, please update the url below in the format http://&lt;new_service_name&gt;.&lt;new_namespace&gt.svc.&lt;port&gt/&lt;path&gt
     banner: To use MS Teams or SMS you will need to have at least one instance of <pre class="inline-block m-0 p-0 vertical-middle">rancher-alerting-drivers</pre> installed first.
+=======
+    title: Custom Configuration
+    info: The YAML provided here will be directly appended to your receiver within the Alertmanager configuration secret.
+  email:
+    label: Email
+    title: Email Configuration
+  opsgenie:
+    label: Opsgenie
+    title: Opsgenie Configuration
+  pagerduty:
+    label: PagerDuty
+    title: PagerDuty Configuration
+    info: "You can find additional info on creating an Integration Key for PagerDuty <a href='https://www.pagerduty.com/docs/guides/prometheus-integration-guide/' target='_blank' rel='noopener nofollow' class='flex-right'>here</a>."
+  slack:
+    label: Slack
+    title: Slack Configuration
+    info: "You can find additional info on creating Incoming Webhooks for Slack <a href='https://rancher.slack.com/apps/A0F7XDUAZ-incoming-webhooks' target='_blank' rel='noopener noreferrer nofollow'>here</a> ."
+  webhook:
+    label: Webhook
+    title: Webhook Configuration
+    urlTooltip: For some webhooks this a URL that point to the service DNS
+    modifyNamespace: If <pre class="inline-block m-0 p-0 vertical-middle">rancher-alerting-drivers</pre> default values were changed, please update the URL below in the format http://&lt;new_service_name&gt;.&lt;new_namespace&gt.svc.&lt;port&gt/&lt;path&gt
+    banner: To use MS Teams or SMS, you will need to have at least one instance of <pre class="inline-block m-0 p-0 vertical-middle">rancher-alerting-drivers</pre> installed first.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     add:
       selectWebhookType: Select Webhook Type
       generic: Generic
@@ -3342,7 +3792,11 @@ monitoringReceiver:
       label: Enable send resolved alerts
 
 alertmanagerConfigReceiver:
+<<<<<<< HEAD
   secretKeyId: Key Id from Secret
+=======
+  secretKeyId: Key ID from Secret
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   name: Receiver Name
   addButton: Add Receiver
   receivers: Receivers
@@ -3356,7 +3810,11 @@ monitoringRoute:
     label: Group By
     addGroupByLabel: Labels to Group Alerts By
     groupByTooltip: Add each label as a string in the format key:value. The special label ... will aggregate by all possible labels. If provided, the ... must be the only element in the list.
+<<<<<<< HEAD
   info: This is the top-level Route used by Alertmanager as the default destination for any Alerts that do not match any other Routes. This Route must exist and cannot be deleted.
+=======
+  info: This is the top-level route used by Alertmanager as the default destination for any alerts that do not match any other routes. This route must exist and cannot be deleted.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   interval:
     label: Group Interval
   matching:
@@ -3417,6 +3875,12 @@ namespace:
   selectNamespace: Select Namespace
   createNamespace: Create a New Namespace
   selectOrCreate: Select or Create a Namespace
+<<<<<<< HEAD
+=======
+  snapshots:
+    label: Snapshots
+    totalSnapshotSize: Total Snapshot Size
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   resourceStates:
       success: 'Active'
       info: 'Transitioning'
@@ -3505,7 +3969,11 @@ networkpolicy:
     ruleHint: Incoming traffic is only allowed from the configured sources
     portHint: Incoming traffic is only allowed to connect to the configured ports
   labelsAnnotations:
+<<<<<<< HEAD
     label: Labels & Annotations
+=======
+    label: Labels and Annotations
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   rules:
     pod: Pod
     namespace: Namespace
@@ -3536,12 +4004,20 @@ networkpolicy:
     namespaceSelector:
       label: Namespace Selector
     namespaceAndPodSelector:
+<<<<<<< HEAD
       label: Namespace/Pod Selector
+=======
+      label: Namespace and Pod Selector
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   config:
     label: Configuration
   selectors:
     label: Selectors
+<<<<<<< HEAD
     hint: The NetworkPolicy is applied to the selected Pods
+=======
+    hint: The NetworkPolicy is applied to the selected pods
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     matchingPods:
       matchesSome: |-
         {matched, plural,
@@ -3593,8 +4069,13 @@ node:
         used: Used
         amount: "{used} of {total} {unit}"
         cpu: CPU
+<<<<<<< HEAD
         memory: MEMORY
         pods: PODS
+=======
+        memory: Memory
+        pods: Pods
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       diskPressure: Disk Pressure
       kubelet: kubelet
       memoryPressure: Memory Pressure
@@ -3716,6 +4197,10 @@ persistentVolume:
       file-csi-azure-com: Azure File (CSI)
       driver-longhorn-io: Longhorn (CSI)
       driver-harvesterhci-io: Harvester (CSI)
+<<<<<<< HEAD
+=======
+      lvm-driver-harvesterhci-io: LVM
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       nfs-csi-k8s-io: NFS (CSI)
       ebs-csi-aws-com: AWS Elastic Block Store (CSI)
       rbd-csi-ceph-com: Ceph RBD (CSI)
@@ -3807,7 +4292,11 @@ persistentVolume:
     portals:
       add: Add Portal
   cinder:
+<<<<<<< HEAD
     label: Openstack Cinder Volume (Unsupported)
+=======
+    label: OpenStack Cinder Volume (Unsupported)
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     volumeId:
       label: Volume ID
       placeholder: e.g. vol
@@ -3892,7 +4381,11 @@ persistentVolume:
       label: Path on the Node
       placeholder: /mnt/disks/ssd1
     mustBe:
+<<<<<<< HEAD
       label: The Path on the Node must be
+=======
+      label: The path on the node must be
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       anything: 'Anything: do not check the target path'
       directory: A directory, or create if it does not exist
       file: A file, or create if it does not exist
@@ -3955,8 +4448,13 @@ persistentVolumeClaim:
   source:
     label: Source
     options:
+<<<<<<< HEAD
       new: Use a Storage Class to provision a new Persistent Volume
       existing: Use an existing Persistent Volume
+=======
+      new: Use a storage class to provision a new persistent volume
+      existing: Use an existing persistent volume
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   expand:
     label: Expand
     notSupported: Storage class does not support volume expansion
@@ -3967,8 +4465,13 @@ persistentVolumeClaim:
     requestStorage: Request Storage
     persistentVolume: Persistent Volume
     tooltips:
+<<<<<<< HEAD
       noStorageClass: You don't have permission to list Storage Classes, enter a name manually
       noPersistentVolume: You don't have permission to list Persistent Volumes, enter a name manually
+=======
+      noStorageClass: You do not have permission to list storage classes, enter a name manually
+      noPersistentVolume: You do not have permission to list persistent volumes, enter a name manually
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   customize:
     label: Customize
     accessModes:
@@ -4007,18 +4510,32 @@ plugins:
     installing: Installing ...
     uninstalling: Uninstalling ...
   descriptions:
+<<<<<<< HEAD
     experimental: This Extension is marked as experimental
     third-party: This Extension is provided by a Third-Party
     built-in: This Extension is built-in
     image: This Extension Image has been loaded manually
+=======
+    experimental: This extension is marked as experimental
+    third-party: This extension is provided by a third-party
+    built-in: This extension is built-in
+    image: This extension image has been loaded manually
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   error:
     title: Error loading extension
     message: Could not load extension code
     generic: Extension error
+<<<<<<< HEAD
     api: This Extension is not compatible with the Extensions API
     host: This Extension is not compatible with this application
     version: This Extension is not compatible with this version of Rancher
     load: An error occurred loading the code for this Extension
+=======
+    api: This extension is not compatible with the extension API
+    host: This extension is not compatible with this application
+    version: This extension is not compatible with this version of Rancher
+    load: An error occurred loading the code for this extension
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   success:
     title: Loaded extension {name}
     message: Extension was loaded successfully
@@ -4037,10 +4554,17 @@ plugins:
     requiresVersion: "Requires Rancher {version}"
   empty:
     all: Extensions are neither installed nor available
+<<<<<<< HEAD
     available: No Extensions available
     installed: No Extensions installed
     updates: No updates available for installed Extensions
     images: No Extension Images installed
+=======
+    available: No extension available
+    installed: No extension installed
+    updates: No updates available for installed extension
+    images: No extension images installed
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   loadError: An error occurred loading the code for this extension
   helmError: "An error occurred installing the extension via Helm"
   manageRepos: Manage Repositories
@@ -4051,14 +4575,23 @@ plugins:
     subtitle: Catalogs
     imageLoad:
       load: Import Extension Catalog
+<<<<<<< HEAD
       prompt: An Extension Catalog contains extension assets bundled into an image, importing will take the image and host a Helm repository to act as a catalog for custom built Extensions. 
+=======
+      prompt: An extension catalog contains extension assets bundled into an image, importing will take the image and host a Helm repository to act as a catalog for custom built extensions.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       fields:
         image:
           label: Catalog Image Reference
           placeholder: "e.g. hub.docker.io/example-org/my-image:latest"
         secrets:
+<<<<<<< HEAD
           banner: "If the registry that hosts the Catalog Image requires Pull Secrets, they must be created in the following namespace:<pre>cattle-ui-plugin-system</pre>"
       banner: This will create an Deployment, Service, and Helm repository to serve the extension charts. 
+=======
+          banner: "If the registry that hosts the catalog image requires pull secrets, they must be created in the following namespace:<pre>cattle-ui-plugin-system</pre>"
+      banner: This will create a deployment, service, and Helm repository to serve the extension charts.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       imageVersion:
         title: Image Version Not Found
         message: Unable to determine image version from {image}, defaulting to latest
@@ -4075,7 +4608,11 @@ plugins:
             message: A repository with the name {repo} already exists
       success:
         title: "Imported Extension Catalog from: {name}"
+<<<<<<< HEAD
         message: Extension Catalog image was imported successfully
+=======
+        message: Extension catalog image was imported successfully
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     headers:
       image:
         name: images
@@ -4094,6 +4631,7 @@ plugins:
   install:
     label: Install
     title: Install Extension {name}
+<<<<<<< HEAD
     prompt: "Are you sure that you want to install this Extension?"
     version: Version
     warnNotCertified: Please ensure that you are aware of the risks of installing Extensions from untrusted authors
@@ -4111,6 +4649,25 @@ plugins:
     prompt: "Are you sure that you want to uninstall this Extension?"
     custom: "Are you sure that you want to uninstall this Extension Image? This will also remove any Extensions provided by this image."
   upgradeAvailable: A newer version of this Extension is available
+=======
+    prompt: "Are you sure that you want to install this extension?"
+    version: Version
+    warnNotCertified: Please ensure that you are aware of the risks of installing extensions from untrusted authors
+  update:
+    label: Update
+    title: Update Extension {name}
+    prompt: "Are you sure that you want to update this extension?"
+  rollback:
+    label: Rollback
+    title: Rollback Extension {name}
+    prompt: "Are you sure that you want to rollback this extension?"
+  uninstall:
+    label: Uninstall
+    title: "Uninstall Extension: {name}"
+    prompt: "Are you sure that you want to uninstall this extension?"
+    custom: "Are you sure that you want to uninstall this extension image? This will also remove any extensions provided by this image."
+  upgradeAvailable: A newer version of this extension is available
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   reload: Extensions changed - reload required
   safeMode:
     title: Extensions Safe Mode
@@ -4119,19 +4676,34 @@ plugins:
     title: Extension support is not enabled
     prompt:
       cant: Automatic installation is not available - required Helm Charts could not be found
+<<<<<<< HEAD
       can: You need to install the Extension Operator
     install:
       title: Enable Extension Support?
       prompt: This will install the Helm charts to enable Extension support
       airgap: The Rancher Extensions Repository provides extensions published by Rancher. Un-check if your Rancher installation is air-gapped
+=======
+      can: You need to install the extension operator
+    install:
+      title: Enable Extension Support?
+      prompt: This will install the Helm charts to enable extension support
+      airgap: The Rancher extensions repository provides extensions published by Rancher. De-select if your Rancher installation is air-gapped
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       addRancherRepo: Add the Rancher Extension Repository
     remove:
       label: Disable Extension Support
       title: Disable Extension Support?
+<<<<<<< HEAD
       prompt: This will un-install the Helm charts that enable Extension support
       registry:
         title: Remove the Rancher Extensions Repository
         prompt: The Rancher Extensions Repository provides extensions published by Rancher
+=======
+      prompt: This will un-install the Helm charts that enable extension support
+      registry:
+        title: Remove the Rancher Extensions Repository
+        prompt: The Rancher extension repository provides extensions published by Rancher
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       crd:
         title: Remove the Rancher Extensions Custom Resource Definition
         prompt: There are one or more extensions installed - removing the CRD will require you to manually reinstall these extensions if you subsequently re-enable extensions support.
@@ -4154,7 +4726,11 @@ podSecurityAdmission:
     placeholder: 'Version (default: latest)'
   exemptions:
     title: Exemptions
+<<<<<<< HEAD
     description: Allow the creation of pods for specific Usernames, RuntimeClassNames, and Namespaces that would otherwise be prohibited due to the policies set above.
+=======
+    description: Allow the creation of pods for specific usernames, RuntimeClassNames, and namespaces that would otherwise be prohibited due to the policies set above.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     placeholder: Enter a comma separated list of {psaExemptionsControl}
 prefs:
   title: Preferences
@@ -4192,9 +4768,15 @@ prefs:
   advFeatures:
     title: Advanced Features
     viewInApi: Enable "View in API"
+<<<<<<< HEAD
     allNamespaces: Show system Namespaces managed by Rancher (not intended for editing or deletion)
     themeShortcut: Enable Dark/Light Theme keyboard shortcut toggle (shift+T)
     pluginDeveloper: Enable Extension developer features
+=======
+    allNamespaces: Show system namespaces managed by Rancher (not intended for editing or deletion)
+    themeShortcut: Enable Dark/Light theme keyboard shortcut toggle (shift+T)
+    pluginDeveloper: Enable extension developer features
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   hideDesc:
     label: Hide All Type Descriptions
   helm:
@@ -4250,9 +4832,15 @@ project:
   members:
     label: Members
   containerDefaultResourceLimit: Container Default Resource Limit
+<<<<<<< HEAD
   vmDefaultResourceLimit: VM Default Resource Limit
   resourceQuotas: Resource Quotas
   haveOneOwner: There must be at least one member with the Owner role.
+=======
+  vmDefaultResourceLimit: Virtual Machine Default Resource Limit
+  resourceQuotas: Resource Quotas
+  haveOneOwner: There must be at least one member with the owner role.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   psp:
     default: Cluster Default
     label: Pod Security Policy
@@ -4264,11 +4852,16 @@ projectMembers:
     label: Project
   projectPermissions:
     label: Project Permissions
+<<<<<<< HEAD
     description: Controls what access users have to the Project
+=======
+    description: Controls what access users have to the project
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     noDescription: User created - no description
     searchForMember: Search for a member to provide project access
     owner:
       label: Owner
+<<<<<<< HEAD
       description: Owners have full control over the Project and all resources inside it.
     member:
       label: Member
@@ -4276,11 +4869,24 @@ projectMembers:
     readOnly:
       label: Read Only
       description: Members can only view the resources inside the Project but not change the resources.
+=======
+      description: Owners have full control over the project and all resources inside it.
+    member:
+      label: Member
+      description: Members can manage the resources inside the project but not change the project itself.
+    readOnly:
+      label: Read Only
+      description: Members can only view the resources inside the project but not change the resources.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     custom:
       label: Custom
       description: Choose individual roles for this user.
     createNs: Create Namespaces
+<<<<<<< HEAD
     configmapsManage: Manage Config Maps
+=======
+    configmapsManage: Manage Configuration Maps
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     ingressManage: Manage Ingress
     projectcatalogsManage: Manage Project Catalogs
     projectroletemplatebindingsManage: Manage Project Members
@@ -4289,7 +4895,11 @@ projectMembers:
     servicesManage: Manage Services
     persistentvolumeclaimsManage: Manage Volumes
     workloadsManage: Manage Workloads
+<<<<<<< HEAD
     configmapsView: View Config Maps
+=======
+    configmapsView: View Configuration Maps
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     ingressView: View Ingress
     monitoringUiView: View Monitoring
     projectcatalogsView: View Project Catalogs
@@ -4325,7 +4935,11 @@ prometheusRule:
       summary:
         input: Summary Annotation Value
         label: Summary
+<<<<<<< HEAD
     bannerText: 'When firing alerts, the annotations and labels will be passed to the configured AlertManagers to allow them to construct the notification that will be sent to any configured Receivers.'
+=======
+    bannerText: 'When firing alerts, the annotations and labels will be passed to the configured AlertManagers to allow them to construct the notification that will be sent to any configured receivers.'
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     for:
       label: Wait to fire for
       placeholder: '60'
@@ -4364,14 +4978,22 @@ prometheusRule:
 
 promptForceRemove:
   modalTitle: Are you sure?
+<<<<<<< HEAD
   removeWarning: "There was an issue with deleting underlying infrastructure. If you proceed with this action, the Machine <b>{nameToMatch}</b> will be deleted from Rancher only. It's highly recommended to manually delete any referenced infrastructure."
+=======
+  removeWarning: "There was an issue with deleting underlying infrastructure. If you proceed with this action, the Machine <b>{nameToMatch}</b> will be deleted from Rancher only. We recommend to manually delete any referenced infrastructure."
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   forceDelete: Force Delete
   confirmName: "Enter in the pool name below to confirm:"
   podRemoveWarning: "Force deleting pods does not wait for confirmation that the pod's processes have been terminated. This may result in <strong>data corruption or inconsistencies</strong>"
 
 promptScaleMachineDown:
   attemptingToRemove: "You are attempting to delete {count} {type}"
+<<<<<<< HEAD
   retainedMachine1: At least one Machine must exist for roles Control Plane and Etcd.
+=======
+  retainedMachine1: At least one machine must exist for roles control plane and Etcd.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   retainedMachine2: <b>{ name }</b> will remain
 
 promptRemove:
@@ -4383,7 +5005,11 @@ promptRemove:
     other { and <b>{count} others</b>.}
     }
   attemptingToRemove: "You are attempting to delete the {type}"
+<<<<<<< HEAD
   attemptingToRemoveAuthConfig: "You are attempting to disable this Auth Provider. <br><br> Be aware that cluster role template bindings, project role template bindings, global role bindings, users, tokens will be all deleted. <br><br> Are you sure you want to proceed?"
+=======
+  attemptingToRemoveAuthConfig: "You are attempting to disable this authenticator provider. <br><br> Be aware that cluster role template bindings, project role template bindings, global role bindings, users, tokens will be all deleted. <br><br> Are you sure you want to proceed?"
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   protip: "Tip: Hold the {alternateLabel} key while clicking delete to bypass this confirmation"
   confirmName: "Enter <b>{nameToMatch}</b> below to confirm:"
   deleteAssociatedNamespaces: "Also delete the namespaces in this project:"
@@ -4425,7 +5051,11 @@ promptSaveAsRKETemplate:
 promptRotateEncryptionKey:
   title: Rotate Encryption Keys
   description: The last backup {name} was performed on {date}
+<<<<<<< HEAD
   warning: Before proceeding, ensure a successful ETCD backup of the cluster has been completed.
+=======
+  warning: Before proceeding, ensure a successful etcd backup of the cluster has been completed.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   error: No backup found
 
 rancherAlertingDrivers:
@@ -4525,10 +5155,17 @@ rbac:
         description: Administrators have full control over the entire installation and all resources in all clusters.
       restricted-admin:
         label: Restricted Administrator
+<<<<<<< HEAD
         description: Restricted Admins have full control over all resources in all downstream clusters but no access to the local cluster.
       user:
         label: Standard User
         description: Standard Users can create new clusters and manage clusters and projects they have been granted access to.
+=======
+        description: Restricted administrators have full control over all resources in all downstream clusters but no access to the local cluster.
+      user:
+        label: Standard User
+        description: Standard users can create new clusters and manage clusters and projects they have been granted access to.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       user-base:
         label: User-Base
         description: User-Base users have login-access only.
@@ -4540,10 +5177,17 @@ rbac:
         description: Allows the user to create new RKE cluster templates and become the owner of them.
       authn-manage:
         label: Configure Authentication
+<<<<<<< HEAD
         description: Allows the user to enable, configure, and disable all Authentication provider settings.
       catalogs-manage:
         label: Legacy Configure Catalogs
         description: Allows the user to add, edit, and remove management.cattle.io based catalogs resources.
+=======
+        description: Allows the user to enable, configure, and disable all authentication provider settings.
+      catalogs-manage:
+        label: Legacy Configure Catalogs
+        description: Allows the user to add, edit, and remove management.cattle.io-based catalog resources.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       clusters-manage:
         label: Manage all Clusters
         description: Allows the user to manage all clusters, including ones they are not a member of.
@@ -4558,21 +5202,33 @@ rbac:
         description: Allows the user to enable and disable custom features via feature flag settings.
       nodedrivers-manage:
         label: Configure Node Drivers
+<<<<<<< HEAD
         description: Allows the user to enable, configure, and remove all Node Driver settings.
       nodetemplates-manage:
         label: Manage Node Templates
         description: Allows the user to define, edit, and remove Node Templates.
+=======
+        description: Allows the user to enable, configure, and remove all node driver settings.
+      nodetemplates-manage:
+        label: Manage Node Templates
+        description: Allows the user to define, edit, and remove node templates.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       podsecuritypolicytemplates-manage:
         label: Manage Pod Security Policies (PSPs)
         description: Allows the user to define, edit, and remove PSPs.
       roles-manage:
         label: Manage Roles
+<<<<<<< HEAD
         description: Allows the user to define, edit, and remove Role definitions.
+=======
+        description: Allows the user to define, edit, and remove role definitions.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       settings-manage:
         label: Manage Settings
         description: 'Allows the user to manage {vendor} Settings.'
       users-manage:
         label: Manage Users
+<<<<<<< HEAD
         description: Allows the user to create, remove, and set passwords for all Users.
       catalogs-use:
         label: Use Catalogs
@@ -4583,6 +5239,18 @@ rbac:
       view-rancher-metrics:
         label: 'View {vendor} Metrics'
         description: Allows the user to view Metrics through the API.
+=======
+        description: Allows the user to create, remove, and set passwords for all users.
+      catalogs-use:
+        label: Use Catalogs
+        description: Allows the user to see and deploy templates from the catalog. Standard users have this permission by default.
+      nodetemplates-use:
+        label: Use Node Templates
+        description: Allows the user to deploy new nodes using any existing node templates.
+      view-rancher-metrics:
+        label: 'View {vendor} Metrics'
+        description: Allows the user to view metrics through the API.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       base:
         label: Login Access
       clustertemplaterevisions-create:
@@ -4623,8 +5291,13 @@ resourceDetail:
     age: Age
     restartCount: Pod Restarts
     defaultBannerMessage:
+<<<<<<< HEAD
       error: This resource is currently in an error state, but there isn't a detailed message available.
       transitioning: This resource is currently in a transitioning state, but there isn't a detailed message available.
+=======
+      error: This resource is currently in an error state, but a detailed message is not available.
+      transitioning: This resource is currently in a transitioning state, a detailed message is not available.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     sensitive:
       hide: Hide Sensitive Values
       show: Show Sensitive Values
@@ -4638,7 +5311,11 @@ resourceDetail:
     managedWarning: |-
       This {type} is managed by {hasName, select,
         no {a {managedBy} app}
+<<<<<<< HEAD
         yes {the {managedBy} app {appName}}}; changes made here will likely be overwritten the next time {managedBy} runs.
+=======
+        yes {the {managedBy} app {appName}}}; changes made here can be overwritten the next time {managedBy} runs.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 resourceList:
   head:
     create: Create
@@ -4686,7 +5363,11 @@ resourceTabs:
 
 resourceYaml:
   errors:
+<<<<<<< HEAD
     namespaceRequired: This resource is namespaced, so a namespace must be provided.
+=======
+    namespaceRequired: This resource is namespaced; a namespace must be provided.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   buttons:
     continue: Continue Editing
     edit: Edit YAML
@@ -4757,12 +5438,20 @@ secret:
   relatedWorkloads: Related Workloads
   typeDescriptions:
     custom:
+<<<<<<< HEAD
       description: Create a Secret with a custom type
+=======
+      description: Create a secret with a custom type
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     'kubernetes.io/basic-auth':
       description: 'Authentication with a username and password'
       docLink: https://kubernetes.io/docs/concepts/configuration/secret/#basic-authentication-secret
     'Opaque':
+<<<<<<< HEAD
       description: Default type of Secret using key-value pairs
+=======
+      description: Default type of secret using key-value pairs
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       docLink: https://kubernetes.io/docs/concepts/configuration/secret/#opaque-secrets
     'kubernetes.io/dockerconfigjson':
       description: Authenticated registry for pulling container images
@@ -4831,9 +5520,15 @@ serviceTypes:
   nodeport: Node Port
 
 servicesPage:
+<<<<<<< HEAD
   serviceListDescription: Services allow you to define a logical set of Pods that can be accessed with a single IP address and port.
   targetPorts: The Service will send requests to this port, and the selected Pods are expected to listen on this port.
   listeningPorts: The Service is exposed on this port.
+=======
+  serviceListDescription: Services allow you to define a logical set of pods that can be accessed with a single IP address and port.
+  targetPorts: The service will send requests to this port, and the selected pods are expected to listen on this port.
+  listeningPorts: The service is exposed on this port.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   anyNode: Any Node
   labelsAnnotations:
     label: Labels & Annotations
@@ -4848,7 +5543,11 @@ servicesPage:
       placeholder: e.g. 10800
   externalName:
     define: External Name
+<<<<<<< HEAD
     helpText: "External Name is intended to specify a canonical DNS name. This is a required field. To hardcode an IP address, use a Headless service."
+=======
+    helpText: "External name is intended to specify a canonical DNS name. This is a required field. To hardcode an IP address, use a headless service."
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     label: External Name
     placeholder: e.g. my.database.example.com
     input:
@@ -4893,7 +5592,11 @@ servicesPage:
   serviceTypes:
     clusterIp:
       abbrv: IP
+<<<<<<< HEAD
       description: Expose a set of Pods to other Pods within the cluster. This type of Service is only reachable from within the cluster. This is the default type.
+=======
+      description: Expose a set of pods to other pods within the cluster. This type of service is only reachable from within the cluster. This is the default type.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       label: Cluster IP
     externalName:
       abbrv: EN
@@ -4918,7 +5621,11 @@ setup:
   currentPassword: Bootstrap Password
   confirmPassword: Confirm New Password
   defaultPassword:
+<<<<<<< HEAD
     intro: It looks like this is your first time visiting {vendor}; if you pre-set your own bootstrap password, enter it here.  Otherwise a random one has been generated for you.  To find it:<br/><br/>
+=======
+    intro: It looks like this is your first time visiting {vendor}; if you have pre-set your own bootstrap password, enter it here. Otherwise a random one has been generated for you. To find it:<br/><br/>
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     dockerPrefix: 'For a "docker run" installation:'
     dockerPs: 'Find your container ID with <code>docker ps</code>, then run:'
     dockerSuffix: ""
@@ -5278,7 +5985,11 @@ tableHeaders:
   apiGroup: API Groups
   apikey: API Key
   available: Available
+<<<<<<< HEAD
   attachedVM: Attached VM
+=======
+  attachedVM: Attached Virtual Machine
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
   authRoles:
     globalDefault: New User Default
@@ -5381,7 +6092,11 @@ tableHeaders:
   namespaceName: Name
   namespaceNameUnlinked: Name
   networkType: Type
+<<<<<<< HEAD
   networkVlan: Vlan ID
+=======
+  networkVlan: VLAN ID
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   node: Node
   nodeName: Node Name
   nodesReady: Nodes Ready
@@ -5471,6 +6186,10 @@ tableHeaders:
   targetKind: Target Type
   targetPort: Target
   template: Template
+<<<<<<< HEAD
+=======
+  totalSnapshotQuota: Total Snapshot Quota
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   type: Type
   updated: Updated
   up-to-date: Up To Date
@@ -5549,7 +6268,11 @@ validation:
     name: Cluster name cannot be 'local' or take the form 'c-xxxxx'
   conflict: |-
     This resource has been modified since you started editing it, and some of those modifications conflict with your changes.
+<<<<<<< HEAD
     This screen has been updated to reflect the current values on the cluster. Review and reapply the changes you wanted to make, then Save again.
+=======
+    This screen has been updated to reflect the current values on the cluster. Review and reapply the changes you wanted to make, then save again.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     Conflicting {fieldCount, plural, =1 {field} other {fields}}: {fields}
   custom:
     missing: 'No validator exists for { validatorName }! Does the validator exist in custom-validators? Is the name spelled correctly?'
@@ -5578,7 +6301,11 @@ validation:
     global: Requires "Cluster Output" to be selected.
   output:
     logdna:
+<<<<<<< HEAD
       apiKey: Required an "Api Key" to be set.
+=======
+      apiKey: Required an "API Key" to be set.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   invalidCron: Invalid cron schedule
   k8s:
     name: Must consist of lower case alphanumeric characters or '-', and must start and end with an alphanumeric character (e.g. 'my-name', or '123-abc').
@@ -5618,17 +6345,28 @@ validation:
   port: A port must be a number between 1 and 65535.
   path: '"{key}" must be an absolute path'
   prometheusRule:
+<<<<<<< HEAD
     noEdit: This Prometheus Rule may not be edited due to invalid characters in name.
+=======
+    noEdit: This Prometheus rule may not be edited due to invalid characters in name.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     groups:
       required: At least one rule group is required.
       singleAlert: A rule may contain alert rules or recording rules but not both.
       valid:
         name: 'Name is required for rule group {index}.'
         rule:
+<<<<<<< HEAD
           alertName: 'Rule group {groupIndex} rule {ruleIndex} requires a Alert Name.'
           expr: 'Rule group {groupIndex} rule {ruleIndex} requires a PromQL Expression.'
           labels: 'Rule group {groupIndex} rule {ruleIndex} requires at least one label. Severity is recommended.'
           recordName: 'Rule group {groupIndex} rule {ruleIndex} requires a Time Series Name.'
+=======
+          alertName: 'Rule group {groupIndex} rule {ruleIndex} requires a alert name.'
+          expr: 'Rule group {groupIndex} rule {ruleIndex} requires a PromQL expression.'
+          labels: 'Rule group {groupIndex} rule {ruleIndex} requires at least one label. Severity is recommended.'
+          recordName: 'Rule group {groupIndex} rule {ruleIndex} requires a time series name.'
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         singleEntry: 'At least one alert rule or one recording rule is required in rule group {index}.'
   required: '"{key}" is required'
   invalid: '"{key}" is invalid'
@@ -5637,12 +6375,21 @@ validation:
   roleTemplate:
     roleTemplateRules:
       missingVerb: You must specify at least one verb for each resource grant
+<<<<<<< HEAD
       missingResource: You must specify a Resource for each resource grant
       missingApiGroup: You must specify an API Group for each resource grant
       missingOneResource: You must specify at least one Resource, Non-Resource URL or API Group for each resource grant
   service:
     externalName:
       none: External Name is required on an ExternalName Service.
+=======
+      missingResource: You must specify a resource for each resource grant
+      missingApiGroup: You must specify an API group for each resource grant
+      missingOneResource: You must specify at least one resource, non-resource URL or API group for each resource grant
+  service:
+    externalName:
+      none: External name is required on an ExternalName service.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     ports:
       name:
         required: 'Port Rule [{position}] - Name is required.'
@@ -5670,7 +6417,11 @@ validation:
     missingProjectId: A target must have a project selected.
   monitoring:
     route:
+<<<<<<< HEAD
       match: At least one Match or Match Regex must be selected
+=======
+      match: At least one match or match regex must be selected
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       interval: '"{key}" must be of a format with digits followed by a unit i.e. 1h, 2m, 30s'
   tab: "One or more fields in this tab contain a form validation error"
 
@@ -5762,9 +6513,15 @@ workload:
       initialDelay: Initial Delay
       livenessProbe: Liveness Check
       livenessTip: Containers will be restarted when this check is failing.  Not recommended for most uses.
+<<<<<<< HEAD
       noHealthCheck: "There is not a Readiness Check, Liveness Check or Startup Check configured."
       readinessProbe: Readiness Checks
       readinessTip: Containers will be removed from service endpoints when this check is failing.  Recommended.
+=======
+      noHealthCheck: "There is not a readiness check, liveness check or startup check configured."
+      readinessProbe: Readiness Checks
+      readinessTip: Containers will be removed from service endpoints when this check is failing. Recommended.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       startupProbe: Startup Check
       startupTip: Containers will wait until this check succeeds before attempting other health checks.
       successThreshold: Success Threshold
@@ -5830,9 +6587,15 @@ workload:
     noServiceAccess: You do not have permission to create or manage services
     ports:
       expose: Networking
+<<<<<<< HEAD
       description: 'Define a Service to expose the container, or define a non-functional, named port so that humans will know where the app within the container is expected to run.'
       detailedDescription: If ClusterIP, LoadBalancer, or NodePort is selected, a Service is automatically created that will select the Pods in this workload using labels.
       toolTip: 'For help exposing workloads on Kubernetes, see the official Kubernetes documentation on Services. You can also manually create a Service to expose Pods by selecting their labels, and you can use an Ingress to map HTTP routes to Services.'
+=======
+      description: 'Define a service to expose the container, or define a non-functional, named port so that other users will know where the application within the container is expected to run.'
+      detailedDescription: If ClusterIP, LoadBalancer, or NodePort is selected, a service is automatically created that will select the pods in this workload using labels.
+      toolTip: 'For help exposing workloads on Kubernetes, see the official Kubernetes documentation on services. You can also manually create a service to expose pods by selecting their labels, and you can use an ingress to map HTTP routes to services.'
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       createService: Service Type
       noCreateService: Do not create a service
       containerPort: Private Container Port
@@ -5906,6 +6669,7 @@ workload:
   detail:
     services: Services
     ingresses: Ingresses
+<<<<<<< HEAD
     cannotViewServices: Could not list Services due to lack of permission.
     cannotFindServices: Could not find any Services that select Pods from this workload.
     serviceListCaption: "The following Services select Pods from this workload:"
@@ -5913,6 +6677,15 @@ workload:
     cannotFindIngresses: Could not find any Ingresses that forward traffic to Services that select Pods in this workload.
     ingressListCaption: "The following Ingresses forward traffic to Services that select Pods from this workload:"
     cannotViewIngressesBecauseCannotViewServices: Could not find relevant relevant Ingresses due to lack of permission to view Services.
+=======
+    cannotViewServices: Could not list services due to lack of permission.
+    cannotFindServices: Could not find any services that select pods from this workload.
+    serviceListCaption: "The following services select pods from this workload:"
+    cannotViewIngresses: Could not list ingresses due to lack of permission.
+    cannotFindIngresses: Could not find any ingresses that forward traffic to services that select pods in this workload.
+    ingressListCaption: "The following ingresses forward traffic to services that select pods from this workload:"
+    cannotViewIngressesBecauseCannotViewServices: Could not find relevant relevant ingresses due to lack of permission to view services.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     pods:
       title: Pods
   detailTop:
@@ -6101,7 +6874,11 @@ workload:
     addMount: Add Mount
     addVolume: Add Volume
     selectVolume: Select Volume
+<<<<<<< HEAD
     noVolumes: Volumes will appear here after they are added in the Pod tab
+=======
+    noVolumes: Volumes will appear here after they are added in the pod tab
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     certificate: Certificate
     csi:
       diskName: Disk Name
@@ -6132,12 +6909,21 @@ workload:
     defaultMode: Default Mode
     driver: driver
     hostPath:
+<<<<<<< HEAD
       label: The Path on the Node must be
       options:
         default: 'Anything: do not check the target path'
         directoryOrCreate: A directory, or create if it doesn't exist
         directory: An existing directory
         fileOrCreate: A file, or create if it doesn't exist
+=======
+      label: The Path on the node must be
+      options:
+        default: 'Anything: do not check the target path'
+        directoryOrCreate: A directory, or create if it does not exist
+        directory: An existing directory
+        fileOrCreate: A file, or create if it does not exist
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         file: An existing file
         socket: An existing socket
         charDevice: An existing character device
@@ -6166,11 +6952,19 @@ workload:
         placeholder: "e.g. 300"
   typeDescriptions:
     apps.daemonset: DaemonSets run exactly one pod on every eligible node. When new nodes are added to the cluster, DaemonSets automatically deploy to them. Recommended for system-wide or vertically-scalable workloads that never need more than one pod per node.
+<<<<<<< HEAD
     apps.deployment: Deployments run a scalable number of replicas of a pod distributed among the eligible nodes. Changes are rolled out incrementally and can be rolled back to the previous revision when needed. Recommended for stateless & horizontally-scalable workloads.
     apps.statefulset: StatefulSets manage stateful applications and provide guarantees about the ordering and uniqueness of the pods created. Recommended for workloads with persistent storage or strict identity, quorum, or upgrade order requirements.
     batch.cronjob: CronJobs create Jobs, which then run Pods, on a repeating schedule. The schedule is expressed in standard Unix cron format, and uses the timezone of the Kubernetes control plane (typically UTC).
     batch.job: Jobs create one or more pods to reliably perform a one-time task by running a pod until it exits successfully. Failed pods are automatically replaced until the specified number of completed runs has been reached. Jobs can also run multiple pods in parallel or function as a batch work queue.
     pod: Pods are the smallest deployable units of computing that you can create and manage in Kubernetes. A Pod is a group of one or more containers, with shared storage and network resources, and a specification for how to run the containers.
+=======
+    apps.deployment: Deployments run a scalable number of replicas of a pod distributed among the eligible nodes. Changes are rolled out incrementally and can be rolled back to the previous revision when needed. Recommended for stateless and horizontally-scalable workloads.
+    apps.statefulset: StatefulSets manage stateful applications and provide guarantees about the ordering and uniqueness of the pods created. Recommended for workloads with persistent storage or strict identity, quorum, or upgrade order requirements.
+    batch.cronjob: CronJobs create jobs, which then run pods, on a repeating schedule. The schedule is expressed in standard Unix cron format, and uses the timezone of the Kubernetes control plane (typically UTC).
+    batch.job: Jobs create one or more pods to reliably perform a one-time task by running a pod until it exits successfully. Failed pods are automatically replaced until the specified number of completed runs has been reached. Jobs can also run multiple pods in parallel or function as a batch work queue.
+    pod: Pods are the smallest deployable units of computing that you can create and manage in Kubernetes. A pod is a group of one or more containers, with shared storage and network resources, and a specification for how to run the containers.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   upgrading:
     activeDeadlineSeconds:
       label: Pod Active Deadline
@@ -6179,8 +6973,13 @@ workload:
       label: Concurrency
       options:
         allow: Allow CronJobs to run concurrently
+<<<<<<< HEAD
         forbid: Skip next run if current run hasn't finished
         replace: Replace run if current run hasn't finished
+=======
+        forbid: Skip next run if current run has not finished
+        replace: Replace run if current run has not finished
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     maxSurge:
       label: Max Surge
       tip: The maximum number of pods allowed beyond the desired scale at any given time.
@@ -6202,7 +7001,11 @@ workload:
       labels:
         delete: "On Delete: New pods are only created when old pods are manually deleted."
         recreate: "Recreate: Kill ALL pods, then start new pods."
+<<<<<<< HEAD
         rollingUpdate: "Rolling Update: Create new pods, until max surge is reached, before deleting old pods. Don't stop more pods than max unavailable."
+=======
+        rollingUpdate: "Rolling Update: Create new pods, until max surge is reached, before deleting old pods. Do not stop more pods than max unavailable."
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     terminationGracePeriodSeconds:
       label: Termination Grace Period
       tip: The duration the pod needs to terminate successfully.
@@ -6299,14 +7102,22 @@ typeDescription:
   cis.cattle.io.clusterscanprofile: A profile is the configuration for the CIS scan, which is the benchmark versions to use and any specific tests to skip in that benchmark.
   cis.cattle.io.clusterscan: A scan is created to trigger a CIS scan on the cluster based on the defined profile. A report is created after the scan is completed.
   cis.cattle.io.clusterscanreport: A report is the result of a CIS scan of the cluster.
+<<<<<<< HEAD
   management.cattle.io.feature: Feature Flags allow certain {vendor} features to be toggled on and off.  Features that are off by default should be considered experimental functionality.
   cluster.x-k8s.io.machine: A Machine encapsulates the configuration of a Kubernetes Node. Use this view to see what happens after updating a cluster.
   cluster.x-k8s.io.machinedeployment: A Machine Deployment orchestrates deployments via templates over a collection of Machine Sets (similar to a Deployment). Use this view to see what happens after updating a cluster.
   cluster.x-k8s.io.machineset: A Machine Set ensures the desired number of Machine resources are up and running at all times (similar to a ReplicaSet). Use this view to see what happens after updating a cluster.
+=======
+  management.cattle.io.feature: Feature flags allow certain {vendor} features to be toggled on and off. Features that are off by default should be considered experimental functionality.
+  cluster.x-k8s.io.machine: A machine encapsulates the configuration of a Kubernetes node. Use this view to see what happens after updating a cluster.
+  cluster.x-k8s.io.machinedeployment: A machine deployment orchestrates deployments via templates over a collection of machine sets (similar to a deployment). Use this view to see what happens after updating a cluster.
+  cluster.x-k8s.io.machineset: A machine set ensures the desired number of machine resources are up and running at all times (similar to a ReplicaSet). Use this view to see what happens after updating a cluster.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   resources.cattle.io.backup: A backup is created to perform one-time backups or schedule recurring backups based on a ResourceSet.
   resources.cattle.io.restore: A restore is created to trigger a restore to the cluster based on a backup file.
   resources.cattle.io.resourceset: A resource set defines which CRDs and resources to store in the backup.
   monitoring.coreos.com.servicemonitor: A service monitor defines the group of services and the endpoints that Prometheus will scrape for metrics. This is the most common way to define metrics collection.
+<<<<<<< HEAD
   monitoring.coreos.com.podmonitor: A pod monitor defines the group of pods that Prometheus will scrape for metrics. The common way is to use service monitors, but pod monitors allow you to handle any situation where a service monitor wouldn't work.
   monitoring.coreos.com.prometheusrule: A Prometheus Rule resource defines both recording and/or alert rules. A recording rule can pre-compute values and save the results. Alerting rules allow you to define conditions on when to send notifications to AlertManager.
   monitoring.coreos.com.prometheus: A Prometheus server is a Prometheus deployment whose scrape configuration and rules are determined by selected ServiceMonitors, PodMonitors, and PrometheusRules and whose alerts will be sent to all selected Alertmanagers with the custom resource's configuration.
@@ -6317,6 +7128,18 @@ typeDescription:
   catalog.cattle.io.operation: An operation is the list of recent Helm operations that have been applied to the cluster.
   catalog.cattle.io.app: An installed application is a Helm 3 chart that was installed either via our charts or through the Helm CLI.
   logging.banzaicloud.io.clusterflow: Logs from the cluster will be collected and logged to the selected Cluster Output.
+=======
+  monitoring.coreos.com.podmonitor: A pod monitor defines the group of pods that Prometheus will scrape for metrics. The common way is to use service monitors, but pod monitors allow you to handle any situation where a service monitor would not work.
+  monitoring.coreos.com.prometheusrule: A Prometheus rule resource defines both recording or alert rules. A recording rule can pre-compute values and save the results. Alerting rules allow you to define conditions on when to send notifications to AlertManager.
+  monitoring.coreos.com.prometheus: A Prometheus server is a Prometheus deployment whose scrape configuration and rules are determined by selected ServiceMonitors, PodMonitors, and PrometheusRules and whose alerts will be sent to all selected Alertmanagers with the custom resource's configuration.
+  monitoring.coreos.com.alertmanager: An alert manager is deployment whose configuration will be specified by a secret in the same namespace, which determines which alerts should go to which receiver.
+  node: The base Kubernetes node resource represents a virtual or physical machine which hosts deployments. To manage the machine lifecycle, if available, go to Cluster Management.
+  catalog.cattle.io.clusterrepo: 'A chart repository is a Helm repository or {vendor} git based application catalog. It provides the list of available charts in the cluster.'
+  catalog.cattle.io.clusterrepo.local: 'A chart repository is a Helm repository or {vendor} git based application catalog. It provides the list of available charts in the cluster. Cluster Templates are deployed via Helm charts.'
+  catalog.cattle.io.operation: An operation is the list of recent Helm operations that have been applied to the cluster.
+  catalog.cattle.io.app: An installed application is a Helm 3 chart that was installed either via our charts or through the Helm CLI.
+  logging.banzaicloud.io.clusterflow: Logs from the cluster will be collected and logged to the selected cluster output.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   logging.banzaicloud.io.clusteroutput: A cluster output defines which logging providers that logs can be sent to and is only effective when deployed in the namespace that the logging operator is in.
   logging.banzaicloud.io.flow: A flow defines which logs to collect and filter as well as which output to send the logs. The flow is a namespaced resource, which means logs will only be collected from the namespace that the flow is deployed in.
   logging.banzaicloud.io.output: An output defines which logging providers that logs can be sent to. The output needs to be in the same namespace as the flow that is using it.
@@ -6350,8 +7173,13 @@ typeLabel:
     }
   catalog.cattle.io.app: |-
     {count, plural,
+<<<<<<< HEAD
       one { Installed App }
       other { Installed Apps }
+=======
+      one { Installed Application }
+      other { Installed Applications }
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     }
   catalog.cattle.io.clusterrepo: |-
     {count, plural,
@@ -6360,6 +7188,7 @@ typeLabel:
     }
   catalog.cattle.io.repo: |-
     {count, plural,
+<<<<<<< HEAD
       one { Namespaced Repo }
       other { Namespaced Repos }
     }
@@ -6372,6 +7201,20 @@ typeLabel:
     {count, plural,
       one { App }
       other { Apps }
+=======
+      one { Namespaced Repository }
+      other { Namespaced Repositories }
+    }
+  chartinstallaction: |-
+    {count, plural,
+      one { Application }
+      other { Applications }
+    }
+  chartupgradeaction: |-
+    {count, plural,
+      one { Application }
+      other { Applications }
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     }
   cloudcredential: |-
     {count, plural,
@@ -6395,8 +7238,13 @@ typeLabel:
     }
   fleet.cattle.io.gitrepo: |-
     {count, plural,
+<<<<<<< HEAD
       one { Git Repo }
       other {Git Repos }
+=======
+      one { Git Repository }
+      other {Git Repositories }
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     }
   management.cattle.io.authconfig: |-
     {count, plural,
@@ -6501,8 +7349,13 @@ typeLabel:
     }
   'management.cattle.io.cluster': |-
     {count, plural,
+<<<<<<< HEAD
       one { Mgmt Cluster }
       other { Mgmt Clusters }
+=======
+      one { Manaagement Cluster }
+      other { Management Clusters }
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     }
   'cluster.x-k8s.io.cluster': |-
     {count, plural,
@@ -6681,8 +7534,13 @@ typeLabel:
     }
   harvesterhci.io.cloudtemplate: |-
     {count, plural,
+<<<<<<< HEAD
       one { Cloud Config Template }
       other { Cloud Config Templates }
+=======
+      one { Cloud Configuration Template }
+      other { Cloud Configuration Templates }
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     }
   fleet.cattle.io.content: |-
     {count, plural,
@@ -6701,8 +7559,13 @@ typeLabel:
     }
   k3s.cattle.io.addon: |-
     {count, plural,
+<<<<<<< HEAD
       one { Addon }
       other { Addons }
+=======
+      one { Add-on }
+      other { Add-ons }
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     }
   management.cattle.io.apiservice: |-
     {count, plural,
@@ -6801,8 +7664,13 @@ typeLabel:
     }
   management.cattle.io.rkeaddon: |-
     {count, plural,
+<<<<<<< HEAD
       one { RkeAddon }
       other { RkeAddons }
+=======
+      one { RKEAddon }
+      other { RKEAddons }
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     }
   management.cattle.io.rkek8sserviceoption: |-
     {count, plural,
@@ -6811,8 +7679,13 @@ typeLabel:
     }
   management.cattle.io.rkek8ssystemimage: |-
     {count, plural,
+<<<<<<< HEAD
       one { RkeK8sSystemImage }
       other { RkeK8sSystemImages }
+=======
+      one { RKEK8sSystemImage }
+      other { RKEK8sSystemImages }
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     }
   rbac.authorization.k8s.io.clusterrolebinding: |-
     {count, plural,
@@ -6880,6 +7753,10 @@ action:
   viewYaml: View YAML
   activate: Activate
   deactivate: Deactivate
+<<<<<<< HEAD
+=======
+  editQuota: Edit Quota
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   show: Show
   hide: Hide
   copy: Copy
@@ -6917,11 +7794,19 @@ podAffinity:
 keyValue:
   keyPlaceholder: e.g. foo
   valuePlaceholder: e.g. bar
+<<<<<<< HEAD
   protip: 'Paste lines of <em>key=value</em> or <em>key: value</em> into any key field for easy bulk entry'
 
 registryMirror:
   header: Mirrors
   toolTip: 'Mirrors can be used to redirect requests for images from one registry to come from a list of endpoints you specify instead.  For example docker.io could redirect to your internal registry instead of ever going to DockerHub.'
+=======
+  protip: 'Paste lines of <em>key=value</em> or <em>key:value</em> into any key field for easy bulk entry'
+
+registryMirror:
+  header: Mirrors
+  toolTip: 'Mirrors can be used to redirect requests for images from one registry to come from a list of endpoints you specify instead. For example docker.io could redirect to your internal registry instead of ever going to DockerHub.'
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   addLabel: Add Mirror
   description: Mirrors define the names and endpoints for private registries. The endpoints are tried one by one, and the first working one is used.
   hostnameLabel: Registry Hostname
@@ -6950,7 +7835,11 @@ registryConfig:
 
 advancedSettings:
   label: Settings
+<<<<<<< HEAD
   subtext: Typical users will not need to change these. Proceed with caution, incorrect values can break your {appName} installation. Settings which have been customized from default settings are tagged 'Modified'.
+=======
+  subtext: Users will not need to change these settings. Proceed with caution as incorrect values can break your {appName} installation. Settings that have been customized from default settings are tagged with 'Modified'.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   show: Show
   hide: Hide
   none: None
@@ -6969,12 +7858,21 @@ advancedSettings:
     'cluster-defaults': 'Override RKE Defaults when creating new clusters.'
     'engine-install-url': 'Default Docker engine installation URL (for most node drivers).'
     'engine-iso-url': 'Default OS installation URL (for vSphere driver).'
+<<<<<<< HEAD
     'engine-newest-version': 'The newest supported version of Docker at the time of this release.  A Docker version that does not satisfy supported docker range but is newer than this will be marked as untested.'
     'engine-supported-range': 'Semver range for supported Docker engine versions.  Versions which do not satisfy this range will be marked unsupported in the UI.'
     'ingress-ip-domain': 'Wildcard DNS domain to use for automatically generated Ingress hostnames. <ingress-name>.<namespace-name>.<ip address of ingress controller> will be added to the domain.'
     'server-url': 'Default {appName} install url. Must be HTTPS. All nodes in your cluster must be able to reach this.'
     'system-default-registry': 'Private registry to be used for all Rancher System Container Images. If no value is specified, the default registry for the container runtime is used. For Docker and containerd, the default is `docker.io`.'
     'ui-index': 'HTML index location for the Cluster Manager UI.'
+=======
+    'engine-newest-version': 'The newest supported version of Docker at the time of this release. A Docker version that does not satisfy supported docker range but is newer than this will be marked as untested.'
+    'engine-supported-range': 'Semver range for supported Docker engine versions. Versions which do not satisfy this range will be marked unsupported in the UI.'
+    'ingress-ip-domain': 'Wildcard DNS domain to use for automatically generated ingress hostnames. <ingress-name>.<namespace-name>.<ip address of ingress controller> will be added to the domain.'
+    'server-url': 'Default {appName} install url. Must be HTTPS. All nodes in your cluster must be able to reach this.'
+    'system-default-registry': 'Private registry to be used for all Rancher system container images. If no value is specified, the default registry for the container runtime is used. For Docker and containerd, the default is `docker.io`.'
+    'ui-index': 'HTML index location for the cluster manager UI.'
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     'ui-dashboard-index': 'HTML index location for the {appName} UI.'
     'ui-offline-preferred': 'Controls whether UI assets are served locally by the server container or from the remote URL defined in the ui-index and ui-dashboard-index settings. The `Dynamic` option will use local assets in production builds of {appName}.'
     'ui-pl': 'Private-Label company name.'
@@ -7039,19 +7937,33 @@ performance:
     label: Incremental Loading
     setting: You can configure the threshold above which incremental loading will be used.
     description: |-
+<<<<<<< HEAD
       When enabled, resources will appear more quickly, but it may take slightly longer to load the entire set of resources. This setting only applies to resources that come from the Kubernetes API
     checkboxLabel: Enable incremental loading
     inputLabel: Resource Threshold
     incompatibleDescription: "Incremental Loading is incomaptible with Namespace/Project filtering. Enabling this will disable it."
+=======
+      When enabled, resources will appear more quickly, but it may take slightly longer to load the entire set of resources. This setting only applies to resources that come from the Kubernetes API.
+    checkboxLabel: Enable incremental loading
+    inputLabel: Resource Threshold
+    incompatibleDescription: "Incremental Loading is incomaptible with namespace or project filtering. Enabling this will disable it."
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   manualRefresh:
     label: Manual Refresh
     setting: You can configure a threshold above which manual refresh will be enabled.
     buttonTooltip: Refresh list
     description: |-
+<<<<<<< HEAD
       When enabled, list data will not auto-update but instead the user must manually trigger a list-view refresh. This setting only applies to resources that come from the Kubernetes API
     checkboxLabel: Enable manual refresh of data for lists
     inputLabel: Resource Threshold
     incompatibleDescription: "Manual Refresh is incomaptible with Namespace/Project filtering. Enabling this will disable it."
+=======
+      When enabled, list data will not auto-update but instead the user must manually trigger a list-view refresh. This setting only applies to resources that come from the Kubernetes API.
+    checkboxLabel: Enable manual refresh of data for lists
+    inputLabel: Resource Threshold
+    incompatibleDescription: "Manual Refresh is incomaptible with namespace or project filtering. Enabling this will disable it."
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   websocketNotification:
     label: Websocket Notifications
     description: |-
@@ -7059,7 +7971,11 @@ performance:
     checkboxLabel: Disable websocket notifications
   gc:
     label: Resource Garbage Collection
+<<<<<<< HEAD
     description: The UI will cache kuberentes resources locally to avoid having to re-fetch them. In some cases this can lead to a large amount of data stored in the browser. Enable this setting to periodically remove them.
+=======
+    description: The UI will cache Kubernetes resources locally to avoid having to re-fetch them. In some cases, this can lead to a large amount of data stored in the browser. Enable this setting to periodically remove them.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     checkboxLabel: Enable Garbage Collection
     whenRun:
       description: Update when garbage collection runs
@@ -7073,25 +7989,42 @@ performance:
     howRun:
       description: Update how garbage collection runs
       age:
+<<<<<<< HEAD
         description: "Resource types musn't have been accessed within this period to be considered for garbage collection."
+=======
+        description: "Resource types must not have been accessed within this period to be considered for garbage collection."
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         inputLabel: Resource Age
       count:
         description: Resource types must exceed this amount to be considered for garbage collection.
         inputLabel: Resource Count
   nsFiltering:
     label: Require Namespace / Project Filtering
+<<<<<<< HEAD
     description: Require the user to select namespaces and/or projects. This restricts the number of resources fetched when viewing lists and should help the responsiveness of the UI in systems with a lot of resources.
     checkboxLabel: Enable Required Namespace / Project Filtering
     incompatibleDescription: "Required Namespace / Project Filtering is incomaptible with Manual Refresh and Incremental Loading. Enabling this will disable them."
   advancedWorker:
     label: Websocket Web Worker
     description: Updates to resources pushed to the UI come via WebSocket and are handled in the UI thread. Enable this option to handle cluster WebSocket updates in a Web Worker in a separate thread. This should help the responsiveness of the UI in systems where resources change often.
+=======
+    description: Require the user to select namespaces or projects. This restricts the number of resources fetched when viewing lists and should help the responsiveness of the UI in systems with a lot of resources.
+    checkboxLabel: Enable Required Namespace or Project Filtering
+    incompatibleDescription: "Required namespace or project filtering is incomaptible with manual refresh and incremental Loading. Enabling this will disable them."
+  advancedWorker:
+    label: Websocket Web Worker
+    description: Updates to resources pushed to the UI come via WebSocket and are handled in the UI thread. Enable this option to handle cluster WebSocket updates in a web worker in a separate thread. This should help the responsiveness of the UI in systems where resources change often.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     checkboxLabel: Enable Advanced Websocket Web Worker
   inactivity:
     title: Inactivity
     checkboxLabel: Enable inactivity session expiration
     inputLabel: Inactivity timeout (minutes)
+<<<<<<< HEAD
     information: To change the automatic logout behaviour, edit the authorisation and/or session token timeout values (<code>auth-user-session-ttl-minutes</code> and <code>auth-token-max-ttl-minutes</code>) in the Settings page.
+=======
+    information: To change the automatic log out behaviour, edit the authorisation and session token timeout values (<code>auth-user-session-ttl-minutes</code> and <code>auth-token-max-ttl-minutes</code>) in the settings page.
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     description: When enabled and the user is inactive past the specified timeout, the UI will no longer fresh page content and the user must reload the page to continue.
     authUserTTL: This timeout cannot be higher than the user session timeout auth-user-session-ttl-minutes, which is currently {current} minutes.
 
@@ -7178,7 +8111,11 @@ resourceQuota:
   helpText: Configure how much of the resources the namespace as a whole can consume.
   helpTextDetail: The amount of resources the namespace as a whole can consume.
   helpTextHarvester: VMs need to reserve additional memory overhead.
+<<<<<<< HEAD
   configMaps: Config Maps
+=======
+  configMaps: Configuration Maps
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   limitsCpu: CPU Limit
   limitsMemory: Memory Limit
   persistentVolumeClaims: Persistent Volume Claims
@@ -7262,8 +8199,13 @@ support:
       text: Login to SUSE Customer Center to access support for your subscription
       action: SUSE Customer Center
       aws:
+<<<<<<< HEAD
         generateConfig: Generate Support Config
         text: 'Login to SUSE Customer Center to access support for your subscription. Need to open a new support case? Download a support config file below.'
+=======
+        generateConfig: Generate Support Configuration
+        text: 'Login to SUSE Customer Center to access support for your subscription. Need to open a new support case? Download a support configuration file below.'
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   promos:
     one:
       title: 24x7 Support
@@ -7297,7 +8239,11 @@ legacy:
   alerts: Alerts
   apps: Apps
   catalogs: Catalogs
+<<<<<<< HEAD
   configMaps: Config Maps
+=======
+  configMaps: Configuration Maps
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   configuration: Configuration
   globalDnsEntries: Global DNS Entries
   globalDnsProviders: Global DNS Providers
@@ -7308,7 +8254,11 @@ legacy:
 
   project:
     label: Project
+<<<<<<< HEAD
     select: "Use the Project/Namespace filter at the top of the page to select a Project in order to see legacy Project features."
+=======
+    select: "Use the namespace or project filter at the top of the page to select a project in order to see legacy project features."
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 serverUpgrade:
   title: "{vendor} Server Changed"
diff --git a/shell/cloud-credential/generic.vue b/shell/cloud-credential/generic.vue
index 17ec5a1f8b0..4e6343d65d1 100644
--- a/shell/cloud-credential/generic.vue
+++ b/shell/cloud-credential/generic.vue
@@ -3,10 +3,20 @@ import CreateEditView from '@shell/mixins/create-edit-view';
 import KeyValue from '@shell/components/form/KeyValue';
 import { Banner } from '@components/Banner';
 import { simplify, iffyFields, likelyFields } from '@shell/store/plugins';
+<<<<<<< HEAD
 
 export default {
   components: { KeyValue, Banner },
   mixins:     [CreateEditView],
+=======
+import Loading from '@shell/components/Loading';
+
+export default {
+  components: {
+    KeyValue, Banner, Loading
+  },
+  mixins: [CreateEditView],
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
   props: {
     driverName: {
@@ -15,19 +25,34 @@ export default {
     }
   },
 
+<<<<<<< HEAD
   data() {
     let keyOptions = [];
 
     const normanType = this.$store.getters['plugins/credentialFieldForDriver'](this.driverName);
     const normanSchema = this.$store.getters['rancher/schemaFor'](`${ normanType }credentialconfig`);
+=======
+  async fetch() {
+    let keyOptions = [];
+
+    const { normanSchema } = this;
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
     if ( normanSchema?.resourceFields ) {
       keyOptions = Object.keys(normanSchema.resourceFields);
     } else {
+<<<<<<< HEAD
       keyOptions = this.$store.getters['plugins/fieldNamesForDriver'](this.driverName);
     }
 
     // Prepopulate empty values for keys that sound like they're cloud-credential-ey
+=======
+      keyOptions = await this.$store.getters['plugins/fieldNamesForDriver'](this.driverName);
+    }
+
+    this.keyOptions = keyOptions;
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     const keys = [];
 
     for ( const k of keyOptions ) {
@@ -43,11 +68,24 @@ export default {
         this.value.setData(k, '');
       }
     }
+<<<<<<< HEAD
 
     return {
       hasSupport: !!normanSchema,
       keyOptions,
       errors:     null,
+=======
+  },
+
+  data() {
+    const normanType = this.$store.getters['plugins/credentialFieldForDriver'](this.driverName);
+    const normanSchema = this.$store.getters['rancher/schemaFor'](`${ normanType }credentialconfig`);
+
+    return {
+      hasSupport: !!normanSchema,
+      errors:     null,
+      normanSchema,
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     };
   },
 
@@ -67,7 +105,12 @@ export default {
 </script>
 
 <template>
+<<<<<<< HEAD
   <div>
+=======
+  <Loading v-if="$fetchState.pending" />
+  <div v-else>
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     <Banner
       v-if="!hasSupport"
       color="info"
diff --git a/shell/components/CruResource.vue b/shell/components/CruResource.vue
index 8bb027a9991..b1ab69baea3 100644
--- a/shell/components/CruResource.vue
+++ b/shell/components/CruResource.vue
@@ -155,8 +155,11 @@ export default {
   },
 
   data(props) {
+<<<<<<< HEAD
     const yaml = this.createResourceYaml();
 
+=======
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     this.$on('createNamespace', (e) => {
       // When createNamespace is set to true,
       // the UI will attempt to create a new namespace
@@ -164,18 +167,43 @@ export default {
       this.createNamespace = e;
     });
 
+<<<<<<< HEAD
+=======
+    const inStore = this.$store.getters['currentStore'](this.resource);
+    const schema = this.$store.getters[`${ inStore }/schemaFor`](this.resource.type);
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     return {
       isCancelModal:   false,
       createNamespace: false,
       showAsForm:      this.$route.query[AS] !== _YAML,
+<<<<<<< HEAD
       resourceYaml:    yaml,
       initialYaml:     yaml,
+=======
+      /**
+       * Initialised on demand (given that it needs to make a request to fetch schema definition)
+       */
+      resourceYaml:    null,
+      /**
+       * Initialised on demand (given that it needs to make a request to fetch schema definition)
+       */
+      initialYaml:     null,
+      /**
+       * Save a copy of the initial resource. This is used to calc the initial yaml later on
+       */
+      initialResource: clone(this.resource),
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       abbrSizes:       {
         3: '24px',
         4: '18px',
         5: '16px',
         6: '14px'
       },
+<<<<<<< HEAD
+=======
+      schema
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     };
   },
 
@@ -197,6 +225,7 @@ export default {
       return this.validationPassed;
     },
 
+<<<<<<< HEAD
     canDiff() {
       return this.initialYaml !== this.resourceYaml;
     },
@@ -206,6 +235,10 @@ export default {
       const schema = this.$store.getters[`${ inStore }/schemaFor`](this.resource.type);
 
       return !(schema?.resourceMethods?.includes('blocked-PUT'));
+=======
+    canEditYaml() {
+      return !(this.schema?.resourceMethods?.includes('blocked-PUT'));
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     },
 
     showYaml() {
@@ -306,8 +339,14 @@ export default {
       }
     },
 
+<<<<<<< HEAD
     createResourceYaml(modifiers) {
       const resource = this.resource;
+=======
+    async createResourceYaml(modifiers, resource = this.resource) {
+      // Required to populate yaml comments and default values
+      await this.schema?.fetchResourceFields();
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
       if ( typeof this.generateYaml === 'function' ) {
         return this.generateYaml.apply(this, resource);
@@ -323,11 +362,21 @@ export default {
     },
 
     async showPreviewYaml() {
+<<<<<<< HEAD
+=======
+      // Required to populate yaml comments and default values
+      await this.schema?.fetchResourceFields();
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       if ( this.applyHooks ) {
         await this.applyHooks(BEFORE_SAVE_HOOKS);
       }
 
+<<<<<<< HEAD
       const resourceYaml = this.createResourceYaml(this.yamlModifiers);
+=======
+      const resourceYaml = await this.createResourceYaml(this.yamlModifiers);
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
       this.resourceYaml = resourceYaml;
       this.showAsForm = false;
@@ -397,6 +446,20 @@ export default {
         event.preventDefault();
       }
     }
+<<<<<<< HEAD
+=======
+  },
+
+  watch: {
+    async showAsForm(neu) {
+      if (!neu) {
+        // Entering yaml mode
+        if (!this.initialYaml) {
+          this.initialYaml = await this.createResourceYaml(undefined, this.initialResource);
+        }
+      }
+    }
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   }
 };
 </script>
@@ -670,8 +733,14 @@ export default {
         </slot>
       </template>
       <!------ YAML ------>
+<<<<<<< HEAD
       <section
         v-else-if="showYaml"
+=======
+      <!-- Hide this section until it's needed. This means we don't need to upfront create initialYaml -->
+      <section
+        v-else-if="showYaml && !showAsForm"
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         class="cru-resource-yaml-container resource-container cru__content"
       >
         <ResourceYaml
@@ -688,7 +757,11 @@ export default {
           class="resource-container cru__content"
           @error="e=>$emit('error', e)"
         >
+<<<<<<< HEAD
           <template #yamlFooter="{yamlSave, showPreview, yamlPreview, yamlUnpreview}">
+=======
+          <template #yamlFooter="{yamlSave, showPreview, yamlPreview, yamlUnpreview, canDiff}">
+>>>>>>> b5455bcb (fix: separate used/allocated units)
             <slot name="cru-yaml-footer">
               <CruResourceFooter
                 class="cru__footer"
diff --git a/shell/components/ExplorerProjectsNamespaces.vue b/shell/components/ExplorerProjectsNamespaces.vue
index d82c936b80c..8c8e7397e1f 100644
--- a/shell/components/ExplorerProjectsNamespaces.vue
+++ b/shell/components/ExplorerProjectsNamespaces.vue
@@ -1,9 +1,15 @@
 <script>
 import { mapGetters } from 'vuex';
 import ResourceTable from '@shell/components/ResourceTable';
+<<<<<<< HEAD
 import { STATE, AGE, NAME } from '@shell/config/table-headers';
 import { uniq } from '@shell/utils/array';
 import { MANAGEMENT, NAMESPACE, VIRTUAL_TYPES } from '@shell/config/types';
+=======
+import { STATE, AGE, NAME, NS_SNAPSHOT_QUOTA } from '@shell/config/table-headers';
+import { uniq } from '@shell/utils/array';
+import { MANAGEMENT, NAMESPACE, VIRTUAL_TYPES, HCI } from '@shell/config/types';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 import { PROJECT_ID, FLAT_VIEW } from '@shell/config/query-params';
 import Masthead from '@shell/components/ResourceList/Masthead';
 import { mapPref, GROUP_RESOURCES, ALL_NAMESPACES, DEV } from '@shell/store/prefs';
@@ -12,6 +18,10 @@ import { defaultTableSortGenerationFn } from '@shell/components/ResourceTable.vu
 import { NAMESPACE_FILTER_ALL_ORPHANS } from '@shell/utils/namespace-filter';
 import ResourceFetch from '@shell/mixins/resource-fetch';
 import DOMPurify from 'dompurify';
+<<<<<<< HEAD
+=======
+import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 export default {
   name:       'ListProjectNamespace',
@@ -35,6 +45,10 @@ export default {
   async fetch() {
     const inStore = this.$store.getters['currentStore'](NAMESPACE);
 
+<<<<<<< HEAD
+=======
+    this.harvesterResourceQuotaSchema = this.$store.getters[`${ inStore }/schemaFor`](HCI.RESOURCE_QUOTA);
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     this.schema = this.$store.getters[`${ inStore }/schemaFor`](NAMESPACE);
     this.projectSchema = this.$store.getters[`management/schemaFor`](MANAGEMENT.PROJECT);
 
@@ -53,6 +67,10 @@ export default {
     return {
       loadResources:                [NAMESPACE],
       loadIndeterminate:            true,
+<<<<<<< HEAD
+=======
+      harvesterResourceQuotaSchema: null,
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       schema:                       null,
       projects:                     [],
       projectSchema:                null,
@@ -84,6 +102,7 @@ export default {
     isNamespaceCreatable() {
       return (this.schema?.collectionMethods || []).includes('POST');
     },
+<<<<<<< HEAD
     headers() {
       const project = {
         name:  'project',
@@ -98,6 +117,35 @@ export default {
         this.groupPreference === 'none' ? project : null,
         AGE
       ].filter(h => h);
+=======
+    isHarvester() {
+      return this.$store.getters['currentProduct'].inStore === HARVESTER;
+    },
+    headers() {
+      const headers = [
+        STATE,
+        NAME,
+      ];
+
+      if (this.groupPreference === 'none') {
+        const projectHeader = {
+          name:  'project',
+          label: this.t('tableHeaders.project'),
+          value: 'project.nameDisplay',
+          sort:  ['projectNameSort', 'nameSort'],
+        };
+
+        headers.push(projectHeader);
+      }
+
+      if (this.isHarvester && this.harvesterResourceQuotaSchema) {
+        headers.push(NS_SNAPSHOT_QUOTA);
+      }
+
+      headers.push(AGE);
+
+      return headers;
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     },
     projectIdsWithNamespaces() {
       const ids = this.rows
diff --git a/shell/components/PromptRemove.vue b/shell/components/PromptRemove.vue
index 083780be824..00ead474953 100644
--- a/shell/components/PromptRemove.vue
+++ b/shell/components/PromptRemove.vue
@@ -247,8 +247,11 @@ export default {
         // where the custom dialog needs to delete additional resources - it handles those and retrurns false to get us
         // to delete the main resource
         if (handled === undefined || handled) {
+<<<<<<< HEAD
           // this.close();
 
+=======
+>>>>>>> b5455bcb (fix: separate used/allocated units)
           return;
         }
       }
diff --git a/shell/components/Questions/__tests__/utils/questions-defaults.ts b/shell/components/Questions/__tests__/utils/questions-defaults.ts
new file mode 100644
index 00000000000..cbb4cd87c47
--- /dev/null
+++ b/shell/components/Questions/__tests__/utils/questions-defaults.ts
@@ -0,0 +1,20 @@
+
+const defaultStubs = {
+  Tab:    true,
+  Tabbed: true,
+};
+const defaultGetters = {
+  currentStore:           () => 'current_store',
+  'management/schemaFor': jest.fn(),
+  'current_store/all':    jest.fn(),
+  'i18n/t':               jest.fn(),
+  'i18n/withFallback':    jest.fn((key, args, fallback) => fallback),
+};
+
+const defaultMocks = { $store: { getters: defaultGetters }, $fetchState: { pending: false } };
+
+export default {
+  stubs:   defaultStubs,
+  getters: defaultGetters,
+  mocks:   defaultMocks,
+};
diff --git a/shell/components/Questions/index.vue b/shell/components/Questions/index.vue
index c0f4eef3085..e5afd887306 100644
--- a/shell/components/Questions/index.vue
+++ b/shell/components/Questions/index.vue
@@ -13,6 +13,10 @@ import ArrayType from './Array';
 import MapType from './QuestionMap';
 import ReferenceType from './Reference';
 import CloudCredentialType from './CloudCredential';
+<<<<<<< HEAD
+=======
+import Loading from '@shell/components/Loading';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 export const knownTypes = {
   string:          StringType,
@@ -108,7 +112,15 @@ function migrate(expr) {
 }
 
 export default {
+<<<<<<< HEAD
   components: { Tab, ...knownTypes },
+=======
+  components: {
+    ...knownTypes,
+    Tab,
+    Loading,
+  },
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
   props: {
     mode: {
@@ -158,6 +170,16 @@ export default {
     }
   },
 
+<<<<<<< HEAD
+=======
+  async fetch() {
+    // If this source is a schema, ensure the schema's `resourceFields` is populated
+    if (this.source.type === 'schema' && this.source.requiresResourceFields) {
+      await this.source.fetchResourceFields();
+    }
+  },
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   data() {
     return { valueGeneration: 0 };
   },
@@ -427,7 +449,15 @@ export default {
 </script>
 
 <template>
+<<<<<<< HEAD
   <form v-if="asTabs">
+=======
+  <Loading
+    v-if="$fetchState.pending"
+    mode="relative"
+  />
+  <form v-else-if="asTabs">
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     <Tab
       v-for="g in groups"
       :key="g.name"
diff --git a/shell/components/ResourceDetail/index.vue b/shell/components/ResourceDetail/index.vue
index 2e2206c42b8..0e277acc7ac 100644
--- a/shell/components/ResourceDetail/index.vue
+++ b/shell/components/ResourceDetail/index.vue
@@ -156,6 +156,11 @@ export default {
       }
 
       if ( as === _YAML ) {
+<<<<<<< HEAD
+=======
+        // fetch resourceFields for createYaml
+        await schema.fetchResourceFields();
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         yaml = createYaml(schemas, resource, data);
       }
     } else {
diff --git a/shell/components/ResourceYaml.vue b/shell/components/ResourceYaml.vue
index 8a303610d20..0fb9cc443a6 100644
--- a/shell/components/ResourceYaml.vue
+++ b/shell/components/ResourceYaml.vue
@@ -357,6 +357,10 @@ export default {
       :yamlPreview="preview"
       :yamlSave="save"
       :yamlUnpreview="unpreview"
+<<<<<<< HEAD
+=======
+      :canDiff="canDiff"
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     >
       <Footer
         v-if="showFooter"
diff --git a/shell/components/form/KeyValue.vue b/shell/components/form/KeyValue.vue
index 4301dcaced0..88d5f8064ce 100644
--- a/shell/components/form/KeyValue.vue
+++ b/shell/components/form/KeyValue.vue
@@ -237,7 +237,11 @@ export default {
     },
     parserSeparators: {
       type:    Array,
+<<<<<<< HEAD
       default: () => [': ', '='],
+=======
+      default: () => [':', '='],
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     },
     loading: {
       default: false,
@@ -492,6 +496,7 @@ export default {
       }
       this.$emit('input', out);
     },
+<<<<<<< HEAD
     onPaste(index, event, pastedValue) {
       const text = event.clipboardData.getData('text/plain');
       const lines = text.split('\n');
@@ -500,6 +505,16 @@ export default {
 
         return line.split(splitter);
       });
+=======
+    onPaste(index, event) {
+      const text = event.clipboardData.getData('text/plain');
+      const lines = text.split('\n');
+      const splits = lines.map((line) => {
+        const splitter = this.parserSeparators.find(sep => line.includes(sep));
+
+        return splitter ? line.split(splitter) : '';
+      }).filter(split => split && split.length > 0);
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
       if (splits.length === 0 || (splits.length === 1 && splits[0].length < 2)) {
         return;
diff --git a/shell/components/form/ResourceTabs/index.vue b/shell/components/form/ResourceTabs/index.vue
index 0690f4dab18..41c3e3863b2 100644
--- a/shell/components/form/ResourceTabs/index.vue
+++ b/shell/components/form/ResourceTabs/index.vue
@@ -72,6 +72,10 @@ export default {
       selectedTab:   this.defaultTab,
       didLoadEvents: false,
       extensionTabs: getApplicableExtensionEnhancements(this, ExtensionPoint.TAB, TabLocation.RESOURCE_DETAIL, this.$route),
+<<<<<<< HEAD
+=======
+      inStore,
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     };
   },
 
@@ -80,6 +84,7 @@ export default {
   },
 
   computed: {
+<<<<<<< HEAD
     showConditions() {
       const inStore = this.$store.getters['currentStore'](this.value.type);
 
@@ -89,6 +94,34 @@ export default {
 
       return false;
     },
+=======
+    /**
+     * Sync checks for showing the conditions tab
+     */
+    preShowConditions() {
+      return this.isView && this.needConditions && this.value?.type;
+    },
+
+    /**
+    * Conditions come from a resource's `status`. They are used by both core resources like workloads as well as those from CRDs
+    *
+    * Check here if the resource type contains conditions via the schema resourceFields
+    */
+    showConditions() {
+      if (!this.preShowConditions) {
+        return false;
+      }
+
+      if (!this.schema.hasResourceFields) {
+        console.warn('Schema does not contain resourceFields, unable to check for status.conditions'); // eslint-disable-line no-console
+
+        return false;
+      }
+
+      return this.$store.getters[`${ this.inStore }/pathExistsInSchema`](this.value.type, 'status.conditions');
+    },
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     showEvents() {
       return this.isView && this.needEvents && this.hasEvents;
     },
diff --git a/shell/components/formatter/IngressTarget.vue b/shell/components/formatter/IngressTarget.vue
index 4110c5e4fad..a7072af7cda 100644
--- a/shell/components/formatter/IngressTarget.vue
+++ b/shell/components/formatter/IngressTarget.vue
@@ -1,5 +1,9 @@
 <script>
+<<<<<<< HEAD
 import { WORKLOAD_TYPES } from '@shell/config/types';
+=======
+import { INGRESS, WORKLOAD_TYPES } from '@shell/config/types';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 import IngressFullPath from '@shell/components/formatter/IngressFullPath';
 
 export default {
@@ -18,7 +22,17 @@ export default {
   },
 
   async fetch() {
+<<<<<<< HEAD
     await Promise.all(Object.values(WORKLOAD_TYPES).map(type => this.$store.dispatch('cluster/findAll', { type })));
+=======
+    const promises = Object.values(WORKLOAD_TYPES).map(type => this.$store.dispatch('cluster/findAll', { type }));
+    const ingressSchema = this.$store.getters[`cluster/schemaFor`](INGRESS);
+
+    if (ingressSchema) {
+      promises.push(ingressSchema.fetchResourceFields());
+    }
+    await Promise.all(promises);
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   },
 
   computed: {
diff --git a/shell/components/formatter/Si.vue b/shell/components/formatter/Si.vue
index 26b945e06c8..c75b45ebaff 100644
--- a/shell/components/formatter/Si.vue
+++ b/shell/components/formatter/Si.vue
@@ -38,5 +38,13 @@ export default {
 </script>
 
 <template>
+<<<<<<< HEAD
   <span>{{ formattedValue }}</span>
+=======
+  <span v-if="value">{{ formattedValue }}</span>
+  <span
+    v-else
+    class="text-muted"
+  >&mdash;</span>
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 </template>
diff --git a/shell/components/nav/Header.vue b/shell/components/nav/Header.vue
index 8ed298c1a8a..dbd1890df56 100644
--- a/shell/components/nav/Header.vue
+++ b/shell/components/nav/Header.vue
@@ -20,6 +20,10 @@ import { allHash } from '@shell/utils/promise';
 import { ActionLocation, ExtensionPoint } from '@shell/core/types';
 import { getApplicableExtensionEnhancements } from '@shell/core/plugin-helpers';
 import IconOrSvg from '@shell/components/IconOrSvg';
+<<<<<<< HEAD
+=======
+import { wait } from '@shell/utils/async';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 const PAGE_HEADER_ACTION = 'page-action';
 
@@ -303,7 +307,11 @@ export default {
       // Make sure we wait at least 1 second so that the user can see the visual indication that the config has been copied
       allHash({
         copy:     this.currentCluster.copyKubeConfig(),
+<<<<<<< HEAD
         minDelay: new Promise(resolve => setTimeout(resolve, 1000))
+=======
+        minDelay: wait(1000),
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       }).finally(() => {
         this.kubeConfigCopying = false;
 
diff --git a/shell/config/labels-annotations.js b/shell/config/labels-annotations.js
index a59316810a4..90a2eed1be6 100644
--- a/shell/config/labels-annotations.js
+++ b/shell/config/labels-annotations.js
@@ -117,9 +117,17 @@ export const SNAPSHOT = { CLUSTER_NAME: 'rke.cattle.io/cluster-name' };
 export const ISTIO = { AUTO_INJECTION: 'istio-injection' };
 
 const CATTLE_REGEX = /cattle\.io\//;
+<<<<<<< HEAD
 
 export const LABELS_TO_IGNORE_REGEX = [
   CATTLE_REGEX
+=======
+const VM_MAINTENANCE_MODE_STRATEGY = /harvesterhci\.io\/maintain-mode-strategy/;
+
+export const LABELS_TO_IGNORE_REGEX = [
+  CATTLE_REGEX,
+  VM_MAINTENANCE_MODE_STRATEGY
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 ];
 
 export const ANNOTATIONS_TO_IGNORE_REGEX = [
diff --git a/shell/config/table-headers.js b/shell/config/table-headers.js
index ae1b43a633f..dd62527fdea 100644
--- a/shell/config/table-headers.js
+++ b/shell/config/table-headers.js
@@ -256,6 +256,24 @@ export const DESCRIPTION = {
   width:    300,
 };
 
+<<<<<<< HEAD
+=======
+export const NS_SNAPSHOT_QUOTA = {
+  name:          'NamespaceSnapshotQuota',
+  labelKey:      'harvester.tableHeaders.totalSnapshotQuota',
+  value:         'snapshotSizeQuota',
+  sort:          'snapshotSizeQuota',
+  align:         'center',
+  formatter:     'Si',
+  formatterOpts: {
+    opts: {
+      increment: 1024, addSuffix: true, suffix: 'i',
+    },
+    needParseSi: false
+  },
+};
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 export const DURATION = {
   name:      'duration',
   labelKey:  'tableHeaders.duration',
diff --git a/shell/config/types.js b/shell/config/types.js
index a5068d42ee8..86c9311dd3a 100644
--- a/shell/config/types.js
+++ b/shell/config/types.js
@@ -4,7 +4,14 @@
 
 // Steve-specific virtual types
 // Base: /v1
+<<<<<<< HEAD
 export const STEVE = { PREFERENCE: 'userpreference' };
+=======
+export const STEVE = {
+  PREFERENCE:        'userpreference',
+  SCHEMA_DEFINITION: 'schemaDefinition'
+};
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 // Old APIs via Norman
 // Base: /v3
@@ -126,6 +133,7 @@ export const MONITORING = {
   SERVICEMONITOR:     'monitoring.coreos.com.servicemonitor',
   THANOSRULER:        'monitoring.coreos.com.thanosruler',
   SPOOFED:            {
+<<<<<<< HEAD
     RECEIVER:                         'monitoring.coreos.com.receiver',
     RECEIVER_SPEC:                    'monitoring.coreos.com.receiver.spec',
     RECEIVER_EMAIL:                   'monitoring.coreos.com.receiver.email',
@@ -139,6 +147,19 @@ export const MONITORING = {
     ROUTE_SPEC:                       'monitoring.coreos.com.route.spec',
     ALERTMANAGERCONFIG_RECEIVER_SPEC: 'monitoring.coreos.com.v1alpha1.alertmanagerconfig.spec.receivers',
     ALERTMANAGERCONFIG_ROUTE_SPEC:    'monitoring.coreos.com.v1alpha1.alertmanagerconfig.spec.route'
+=======
+    RECEIVER:             'monitoring.coreos.com.receiver',
+    RECEIVER_SPEC:        'monitoring.coreos.com.receiver.spec',
+    RECEIVER_EMAIL:       'monitoring.coreos.com.receiver.email',
+    RECEIVER_SLACK:       'monitoring.coreos.com.receiver.slack',
+    RECEIVER_WEBHOOK:     'monitoring.coreos.com.receiver.webhook',
+    RECEIVER_PAGERDUTY:   'monitoring.coreos.com.receiver.pagerduty',
+    RECEIVER_OPSGENIE:    'monitoring.coreos.com.receiver.opsgenie',
+    RECEIVER_HTTP_CONFIG: 'monitoring.coreos.com.receiver.httpconfig',
+    RESPONDER:            'monitoring.coreos.com.receiver.responder',
+    ROUTE:                'monitoring.coreos.com.route',
+    ROUTE_SPEC:           'monitoring.coreos.com.route.spec',
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   }
 };
 
@@ -290,6 +311,10 @@ export const HCI = {
   DASHBOARD:        'harvesterhci.io.dashboard',
   IMAGE:            'harvesterhci.io.virtualmachineimage',
   SETTING:          'harvesterhci.io.setting',
+<<<<<<< HEAD
+=======
+  RESOURCE_QUOTA:   'harvesterhci.io.resourcequota',
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   HARVESTER_CONFIG: 'rke-machine-config.cattle.io.harvesterconfig',
 };
 
diff --git a/shell/core/plugin-helpers.js b/shell/core/plugin-helpers.js
index 64aed510d33..542719cec35 100644
--- a/shell/core/plugin-helpers.js
+++ b/shell/core/plugin-helpers.js
@@ -2,7 +2,11 @@ import { ActionLocation, CardLocation, ExtensionPoint } from '@shell/core/types'
 import { isMac } from '@shell/utils/platform';
 import { ucFirst, randomStr } from '@shell/utils/string';
 import { _EDIT, _CONFIG, _DETAIL, _LIST } from '@shell/config/query-params';
+<<<<<<< HEAD
 import { getProductFromRoute } from '@shell/middleware/authenticated';
+=======
+import { getProductFromRoute } from '@shell/utils/router';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 function checkRouteProduct({ name, params, query }, locationConfigParam) {
   const product = getProductFromRoute({
diff --git a/shell/creators/app/app.package.json b/shell/creators/app/app.package.json
index c7993757e30..e650360872f 100644
--- a/shell/creators/app/app.package.json
+++ b/shell/creators/app/app.package.json
@@ -8,6 +8,10 @@
   "dependencies": {},
   "resolutions": {
     "**/webpack": "4",
+<<<<<<< HEAD
     "@types/node": "^16"
+=======
+    "@types/node": "16.11.7"
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   }  
 }
diff --git a/shell/detail/cis.cattle.io.clusterscan.vue b/shell/detail/cis.cattle.io.clusterscan.vue
index ef5bcadc354..fa00cb53754 100644
--- a/shell/detail/cis.cattle.io.clusterscan.vue
+++ b/shell/detail/cis.cattle.io.clusterscan.vue
@@ -10,6 +10,11 @@ import { escapeHtml, randomStr } from '@shell/utils/string';
 import { CIS } from '@shell/config/types';
 import { STATE } from '@shell/config/table-headers';
 import { get } from '@shell/utils/object';
+<<<<<<< HEAD
+=======
+import { allHash } from '@shell/utils/promise';
+import { fetchSpecsScheduledScanConfig } from '@shell/models/cis.cattle.io.clusterscan';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 export default {
   components: {
@@ -30,7 +35,20 @@ export default {
   },
 
   async fetch() {
+<<<<<<< HEAD
     this.clusterReports = await this.value.getReports();
+=======
+    const inStore = this.$store.getters['currentProduct'].inStore;
+    const schema = this.$store.getters[`${ inStore }/schemaFor`](this.value);
+
+    const hash = await allHash({
+      clusterReports:         this.value.getReports(),
+      // Ensure the clusterscan model has everything it needs
+      hasScheduledScanConfig: fetchSpecsScheduledScanConfig(schema),
+    });
+
+    this.clusterReports = hash.clusterReports;
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   },
 
   data() {
diff --git a/shell/detail/networking.k8s.io.ingress.vue b/shell/detail/networking.k8s.io.ingress.vue
index 3b151105e7d..d4195e7b46b 100644
--- a/shell/detail/networking.k8s.io.ingress.vue
+++ b/shell/detail/networking.k8s.io.ingress.vue
@@ -17,8 +17,14 @@ export default {
   mixins: [CreateEditView],
   async fetch() {
     const hash = await allHash({
+<<<<<<< HEAD
       secrets:  this.$store.dispatch('cluster/findAll', { type: SECRET }),
       services: this.$store.dispatch('cluster/findAll', { type: SERVICE }),
+=======
+      secrets:        this.$store.dispatch('cluster/findAll', { type: SECRET }),
+      services:       this.$store.dispatch('cluster/findAll', { type: SERVICE }),
+      resourceFields: this.schema.fetchResourceFields(),
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     });
 
     this.allServices = hash.services;
@@ -57,6 +63,7 @@ export default {
 };
 </script>
 <template>
+<<<<<<< HEAD
   <ResourceTabs
     v-model="value"
     mode="view"
@@ -72,6 +79,23 @@ export default {
         :mode="mode"
         :service-targets="serviceTargets"
         :certificates="certificates"
+=======
+  <ResourceTabs
+    v-model="value"
+    mode="view"
+    class="mt-20"
+  >
+    <Tab
+      :label="t('ingress.rules.title')"
+      name="rules"
+      :weight="1"
+    >
+      <Rules
+        v-model="value"
+        :mode="mode"
+        :service-targets="serviceTargets"
+        :certificates="certificates"
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       />
     </Tab>
   </ResourceTabs>
diff --git a/shell/detail/provisioning.cattle.io.cluster.vue b/shell/detail/provisioning.cattle.io.cluster.vue
index c3301fceb88..bf92055cd1b 100644
--- a/shell/detail/provisioning.cattle.io.cluster.vue
+++ b/shell/detail/provisioning.cattle.io.cluster.vue
@@ -82,7 +82,30 @@ export default {
 
   async fetch() {
     await this.value.waitForProvisioner();
+<<<<<<< HEAD
     const fetchOne = {};
+=======
+
+    const extClass = this.$plugin.getDynamic('provisioner', this.value.machineProvider);
+
+    if (extClass) {
+      this.extProvider = new extClass({
+        dispatch: this.$store.dispatch,
+        getters:  this.$store.getters,
+        axios:    this.$store.$axios,
+        $plugin:  this.$store.app.$plugin,
+        $t:       this.t
+      });
+      this.extDetailTabs = {
+        ...this.extDetailTabs,
+        ...this.extProvider.detailTabs
+      };
+      this.extCustomParams = { provider: this.value.machineProvider };
+    }
+
+    const schema = this.$store.getters[`management/schemaFor`](CAPI.RANCHER_CLUSTER);
+    const fetchOne = { schemaDefinitions: schema.fetchResourceFields() };
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
     if ( this.$store.getters['management/canList'](CAPI.MACHINE_DEPLOYMENT) ) {
       fetchOne.machineDeployments = this.$store.dispatch('management/findAll', { type: CAPI.MACHINE_DEPLOYMENT });
diff --git a/shell/edit/cis.cattle.io.clusterscan.vue b/shell/edit/cis.cattle.io.clusterscan.vue
index b00cdeef183..780cbba31f1 100644
--- a/shell/edit/cis.cattle.io.clusterscan.vue
+++ b/shell/edit/cis.cattle.io.clusterscan.vue
@@ -14,6 +14,10 @@ import { RadioGroup } from '@components/Form/Radio';
 import { get } from '@shell/utils/object';
 import { _VIEW, _CREATE } from '@shell/config/query-params';
 import { isValidCron } from 'cron-validator';
+<<<<<<< HEAD
+=======
+import { fetchSpecsScheduledScanConfig } from '@shell/models/cis.cattle.io.clusterscan';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 const semver = require('semver');
 
@@ -39,8 +43,15 @@ export default {
 
   async fetch() {
     const hash = await allHash({
+<<<<<<< HEAD
       profiles:   this.$store.dispatch('cluster/findAll', { type: CIS.CLUSTER_SCAN_PROFILE }),
       benchmarks: this.$store.dispatch('cluster/findAll', { type: CIS.BENCHMARK }),
+=======
+      profiles:               this.$store.dispatch('cluster/findAll', { type: CIS.CLUSTER_SCAN_PROFILE }),
+      benchmarks:             this.$store.dispatch('cluster/findAll', { type: CIS.BENCHMARK }),
+      // Ensure the clusterscan model has everything it needs
+      hasScheduledScanConfig: fetchSpecsScheduledScanConfig(this.schema),
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     });
 
     try {
diff --git a/shell/edit/configmap.vue b/shell/edit/configmap.vue
index fd5d3babfdb..bc8dd9278ce 100644
--- a/shell/edit/configmap.vue
+++ b/shell/edit/configmap.vue
@@ -61,7 +61,11 @@ export default {
 
   methods: {
     async saveConfigMap() {
+<<<<<<< HEAD
       const yaml = this.$refs.cru.createResourceYaml(this.yamlModifiers);
+=======
+      const yaml = await this.$refs.cru.createResourceYaml(this.yamlModifiers);
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
       await this.value.saveYaml(yaml);
       this.done();
diff --git a/shell/edit/logging-flow/index.vue b/shell/edit/logging-flow/index.vue
index 70897c08b9b..f2f322a08a4 100644
--- a/shell/edit/logging-flow/index.vue
+++ b/shell/edit/logging-flow/index.vue
@@ -94,7 +94,12 @@ export default {
     if ( this.value.spec.filters?.length ) {
       filtersYaml = jsyaml.dump(this.value.spec.filters);
     } else {
+<<<<<<< HEAD
       filtersYaml = createYaml(schemas, LOGGING.SPOOFED.FILTERS, []);
+=======
+      // Note - no need to call fetchResourceFields here (spoofed type has popoulated resourceFields)
+      filtersYaml = createYaml(schemas, LOGGING.SPOOFED.FILTERS, {});
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       // createYaml doesn't support passing reference types (array, map) as the first type. As such
       // I'm manipulating the output since I'm not sure it's something we want to actually support
       // seeing as it's really createResourceYaml and this here is a gray area between spoofed types
diff --git a/shell/edit/logging.banzaicloud.io.output/index.vue b/shell/edit/logging.banzaicloud.io.output/index.vue
index f5c8923f4aa..69390fbd2d6 100644
--- a/shell/edit/logging.banzaicloud.io.output/index.vue
+++ b/shell/edit/logging.banzaicloud.io.output/index.vue
@@ -1,6 +1,10 @@
 <script>
 import CreateEditView from '@shell/mixins/create-edit-view';
 import { SECRET, LOGGING, SCHEMA } from '@shell/config/types';
+<<<<<<< HEAD
+=======
+import Loading from '@shell/components/Loading';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 import Tabbed from '@shell/components/Tabbed';
 import Tab from '@shell/components/Tabbed/Tab';
 import CruResource from '@shell/components/CruResource';
@@ -19,18 +23,61 @@ import YamlEditor, { EDITOR_MODES } from '@shell/components/YamlEditor';
 
 export default {
   components: {
+<<<<<<< HEAD
     Banner, CruResource, Labels, LabeledSelect, NameNsDescription, Tab, Tabbed, YamlEditor
   },
+=======
+    Banner, CruResource, Labels, LabeledSelect, NameNsDescription, Tab, Tabbed, YamlEditor, Loading
+  }, //
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
   mixins: [CreateEditView],
 
   async fetch() {
+<<<<<<< HEAD
     await this.$store.dispatch('cluster/findAll', { type: SECRET });
   },
 
   data() {
     const schemas = this.$store.getters['cluster/all'](SCHEMA);
 
+=======
+    const schemas = this.$store.getters['cluster/all'](SCHEMA);
+    const resourceSchema = this.$store.getters['cluster/byId'](SCHEMA, LOGGING.OUTPUT);
+
+    await this.$store.dispatch('cluster/findAll', { type: SECRET });
+    const schemaDefinition = await resourceSchema.fetchResourceFields();
+
+    let bufferYaml = '';
+
+    if ( !isEmpty(this.value.spec[this.selectedProvider]?.buffer) ) {
+      bufferYaml = jsyaml.dump(this.value.spec[this.selectedProvider].buffer);
+    } else if (schemaDefinition) {
+      bufferYaml = createYaml(
+        schemas,
+        `io.banzaicloud.logging.v1beta1.Output.spec.${ this.selectedProvider }.buffer`,
+        {},
+        true,
+        1,
+        '',
+        LOGGING.OUTPUT
+      );
+
+      // createYaml doesn't support passing reference types (array, map) as the first type. As such
+      // I'm manipulating the output since I'm not sure it's something we want to actually support
+      // seeing as it's really createResourceYaml and this here is a gray area between spoofed types
+      // and just a field within a spec.
+      bufferYaml = bufferYaml.substring(bufferYaml.indexOf('\n') + 1).replace(/# {2}/g, '#');
+    }
+
+    if (bufferYaml.length) {
+      this.bufferYaml = bufferYaml;
+      this.initialBufferYaml = bufferYaml;
+    }
+  },
+
+  data() {
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     if (this.isCreate) {
       this.value.metadata.namespace = 'default';
     }
@@ -44,8 +91,11 @@ export default {
     }));
 
     if (this.mode !== _VIEW) {
+<<<<<<< HEAD
       this.$set(this.value, 'spec', this.value.spec || {});
 
+=======
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       providers.forEach((provider) => {
         this.$set(this.value.spec, provider.name, this.value.spec[provider.name] || clone(provider.default));
       });
@@ -58,6 +108,7 @@ export default {
       return !isEmpty(correctedSpecProvider) && !isEqual(correctedSpecProvider, provider.default);
     });
 
+<<<<<<< HEAD
     const selectedProvider = selectedProviders?.[0]?.value || providers[0].value;
 
     let bufferYaml;
@@ -80,6 +131,17 @@ export default {
       selectedProvider,
       hasMultipleProvidersSelected: selectedProviders?.length > 1,
       selectedProviders,
+=======
+    const hasMultipleProvidersSelected = selectedProviders?.length > 1;
+
+    const selectedProvider = selectedProviders?.[0]?.value || providers[0].value;
+
+    return {
+      bufferYaml: '',
+      providers,
+      selectedProvider,
+      hasMultipleProvidersSelected,
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       LOGGING
     };
   },
@@ -157,7 +219,15 @@ export default {
 </script>
 
 <template>
+<<<<<<< HEAD
   <div class="output">
+=======
+  <Loading v-if="$fetchState.pending" />
+  <div
+    v-else
+    class="output"
+  >
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     <CruResource
       :done-route="doneRoute"
       :mode="cruMode"
diff --git a/shell/edit/management.cattle.io.user.vue b/shell/edit/management.cattle.io.user.vue
index 38b8d41a071..3557c7c0408 100644
--- a/shell/edit/management.cattle.io.user.vue
+++ b/shell/edit/management.cattle.io.user.vue
@@ -8,6 +8,10 @@ import CruResource from '@shell/components/CruResource';
 import { exceptionToErrorsArray } from '@shell/utils/error';
 import { _CREATE, _EDIT } from '@shell/config/query-params';
 import Loading from '@shell/components/Loading';
+<<<<<<< HEAD
+=======
+import { wait } from '@shell/utils/async';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 export default {
   components: {
@@ -159,7 +163,11 @@ export default {
         // - Fetching the norman user again sometimes shows the correct value, sometimes not
         // - Even if the fetched norman user shows the correct value, it doesn't show up in the steve user
         //   - Looks like we re-request the stale version via socket?
+<<<<<<< HEAD
         await new Promise(resolve => setTimeout(resolve, 5000));
+=======
+        await wait(5000);
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       }
 
       // Save user updates
diff --git a/shell/edit/monitoring.coreos.com.alertmanagerconfig/index.vue b/shell/edit/monitoring.coreos.com.alertmanagerconfig/index.vue
index dee44137c82..0a493de915e 100644
--- a/shell/edit/monitoring.coreos.com.alertmanagerconfig/index.vue
+++ b/shell/edit/monitoring.coreos.com.alertmanagerconfig/index.vue
@@ -13,6 +13,10 @@ import RouteConfig from './routeConfig';
 import ResourceTable from '@shell/components/ResourceTable';
 import ActionMenu from '@shell/components/ActionMenu';
 import { _CREATE, _EDIT, _VIEW, _CONFIG } from '@shell/config/query-params';
+<<<<<<< HEAD
+=======
+import { fetchAlertManagerConfigSpecs } from '@shell/utils/alertmanagerconfig';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 export default {
   components: {
@@ -32,11 +36,23 @@ export default {
     const inStore = this.$store.getters['currentProduct'].inStore;
     const alertmanagerConfigId = this.value.id;
 
+<<<<<<< HEAD
+=======
+    const { receiverSchema, routeSchema } = await fetchAlertManagerConfigSpecs(this.$store);
+
+    this.receiverSchema = receiverSchema;
+    this.routeSchema = routeSchema;
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     const alertmanagerConfigResource = await this.$store.dispatch(`${ inStore }/find`, { type: MONITORING.ALERTMANAGERCONFIG, id: alertmanagerConfigId });
 
     this.alertmanagerConfigId = alertmanagerConfigId;
     this.alertmanagerConfigResource = alertmanagerConfigResource;
+<<<<<<< HEAD
     this.alertmanagerConfigDetailRoute = alertmanagerConfigResource._detailLocation;
+=======
+    this.alertmanagerConfigDetailRoute = alertmanagerConfigResource?._detailLocation;
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
     const alertmanagerConfigActions = alertmanagerConfigResource.availableActions;
     const receiverActions = alertmanagerConfigResource.getReceiverActions(alertmanagerConfigActions);
@@ -48,8 +64,11 @@ export default {
     this.value.applyDefaults();
 
     const defaultReceiverValues = {};
+<<<<<<< HEAD
     const receiverSchema = this.$store.getters['cluster/schemaFor'](MONITORING.SPOOFED.ALERTMANAGERCONFIG_RECEIVER_SPEC);
     const routeSchema = this.$store.getters['cluster/schemaFor'](MONITORING.SPOOFED.ALERTMANAGERCONFIG_ROUTE_SPEC);
+=======
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     const receiverOptions = (this.value?.spec?.receivers || []).map(receiver => receiver.name);
 
     return {
@@ -82,8 +101,11 @@ export default {
       receiverActions:      [],
       receiverOptions,
       receiverTypes:        RECEIVERS_TYPES,
+<<<<<<< HEAD
       routeSchema,
       receiverSchema,
+=======
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       selectedReceiverName: '',
       selectedRowValue:     null,
       view:                 _VIEW,
diff --git a/shell/edit/monitoring.coreos.com.alertmanagerconfig/receiverConfig.vue b/shell/edit/monitoring.coreos.com.alertmanagerconfig/receiverConfig.vue
index a90e1001f3e..1308c6372e7 100644
--- a/shell/edit/monitoring.coreos.com.alertmanagerconfig/receiverConfig.vue
+++ b/shell/edit/monitoring.coreos.com.alertmanagerconfig/receiverConfig.vue
@@ -1,5 +1,8 @@
 <script>
+<<<<<<< HEAD
 import { MONITORING } from '@shell/config/types';
+=======
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 import ArrayListGrouped from '@shell/components/form/ArrayListGrouped';
 import Loading from '@shell/components/Loading';
 import { Banner } from '@components/Banner';
@@ -13,6 +16,10 @@ import jsyaml from 'js-yaml';
 import ButtonDropdown from '@shell/components/ButtonDropdown';
 import { _CREATE, _VIEW } from '@shell/config/query-params';
 import FormValidation from '@shell/mixins/form-validation';
+<<<<<<< HEAD
+=======
+import { fetchAlertManagerConfigSpecs } from '@shell/utils/alertmanagerconfig';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 export const RECEIVERS_TYPES = [
   {
@@ -103,6 +110,7 @@ export default {
 
   mixins: [CreateEditView, FormValidation],
 
+<<<<<<< HEAD
   data(props) {
     const currentReceiver = {};
     const mode = this.$route.query.mode;
@@ -115,6 +123,9 @@ export default {
       });
     }
 
+=======
+  async fetch() {
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     /**
      * example receiver value:
      * {
@@ -122,6 +133,7 @@ export default {
      *   slackConfigs: [...]
      * }
      */
+<<<<<<< HEAD
     const receiverSchema = this.$store.getters[`${ inStore }/schemaFor`](MONITORING.SPOOFED.ALERTMANAGERCONFIG_RECEIVER_SPEC);
 
     if (!receiverSchema) {
@@ -130,6 +142,15 @@ export default {
 
     const expectedFields = Object.keys(receiverSchema.resourceFields);
 
+=======
+    const { receiverSchema } = await fetchAlertManagerConfigSpecs(this.$store);
+
+    if (!receiverSchema) {
+      throw new Error("Can't render the form because the AlertmanagerConfig schema, or it's definitions, is not loaded yet.");
+    }
+
+    const expectedFields = Object.keys(receiverSchema.resourceFields);
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     const suffix = {};
 
     Object.keys(this.value).forEach((key) => {
@@ -144,6 +165,7 @@ export default {
       suffixYaml = '';
     }
 
+<<<<<<< HEAD
     return {
       create:         _CREATE,
       EDITOR_MODES,
@@ -151,6 +173,27 @@ export default {
       fileFound:      false,
       receiverTypes:  RECEIVERS_TYPES,
       suffixYaml,
+=======
+    this.expectedFields = expectedFields;
+    this.suffixYaml = suffixYaml;
+  },
+
+  data(props) {
+    const currentReceiver = {};
+    const mode = this.$route.query.mode;
+
+    if (mode === _CREATE) {
+      RECEIVERS_TYPES.forEach((receiverType) => {
+        this.$set(currentReceiver, receiverType.key, currentReceiver[receiverType.key] || []);
+      });
+    }
+
+    return {
+      create:         _CREATE,
+      EDITOR_MODES,
+      fileFound:      false,
+      receiverTypes:  RECEIVERS_TYPES,
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       view:           _VIEW,
       yamlError:      '',
       fvFormRuleSets: [
diff --git a/shell/edit/networking.k8s.io.ingress/index.vue b/shell/edit/networking.k8s.io.ingress/index.vue
index 08685b9f6d1..a7a72b690d3 100644
--- a/shell/edit/networking.k8s.io.ingress/index.vue
+++ b/shell/edit/networking.k8s.io.ingress/index.vue
@@ -15,6 +15,10 @@ import DefaultBackend from './DefaultBackend';
 import Certificates from './Certificates';
 import Rules from './Rules';
 import IngressClass from './IngressClass';
+<<<<<<< HEAD
+=======
+import Loading from '@shell/components/Loading';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 export default {
   name:       'CRUIngress',
@@ -28,7 +32,12 @@ export default {
     Rules,
     Tab,
     Tabbed,
+<<<<<<< HEAD
     Error
+=======
+    Error,
+    Loading,
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   },
   mixins: [CreateEditView, FormValidation],
   props:  {
@@ -46,9 +55,16 @@ export default {
   async fetch() {
     this.ingressClassSchema = this.$store.getters[`cluster/schemaFor`](INGRESS_CLASS);
     const hash = await allHash({
+<<<<<<< HEAD
       secrets:        this.$store.dispatch('cluster/findAll', { type: SECRET }),
       services:       this.$store.dispatch('cluster/findAll', { type: SERVICE }),
       ingressClasses: this.ingressClassSchema ? this.$store.dispatch('cluster/findAll', { type: INGRESS_CLASS }) : Promise.resolve([]),
+=======
+      secrets:               this.$store.dispatch('cluster/findAll', { type: SECRET }),
+      services:              this.$store.dispatch('cluster/findAll', { type: SERVICE }),
+      ingressClasses:        this.ingressClassSchema ? this.$store.dispatch('cluster/findAll', { type: INGRESS_CLASS }) : Promise.resolve([]),
+      ingressResourceFields: this.schema.fetchResourceFields(),
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     });
 
     this.allServices = hash.services;
@@ -191,7 +207,13 @@ export default {
 };
 </script>
 <template>
+<<<<<<< HEAD
   <CruResource
+=======
+  <Loading v-if="$fetchState.pending" />
+  <CruResource
+    v-else
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     :done-route="doneRoute"
     :mode="mode"
     :resource="value"
diff --git a/shell/layouts/default.vue b/shell/layouts/default.vue
index 28ea217c8aa..b3096969e56 100644
--- a/shell/layouts/default.vue
+++ b/shell/layouts/default.vue
@@ -36,7 +36,11 @@ import { getVersionInfo, markSeenReleaseNotes } from '@shell/utils/version';
 import { sortBy } from '@shell/utils/sort';
 import PageHeaderActions from '@shell/mixins/page-actions';
 import BrowserTabVisibility from '@shell/mixins/browser-tab-visibility';
+<<<<<<< HEAD
 import { getClusterFromRoute, getProductFromRoute } from '@shell/middleware/authenticated';
+=======
+import { getClusterFromRoute, getProductFromRoute } from '@shell/utils/router';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 import { BOTTOM } from '@shell/utils/position';
 import { BLANK_CLUSTER } from '@shell/store';
 
@@ -84,7 +88,13 @@ export default {
   computed: {
     ...mapState(['managementReady', 'clusterReady']),
     ...mapGetters(['productId', 'clusterId', 'namespaceMode', 'isExplorer', 'currentProduct', 'isSingleProduct', 'isRancherInHarvester', 'isVirtualCluster']),
+<<<<<<< HEAD
     ...mapGetters({ locale: 'i18n/selectedLocaleLabel', availableLocales: 'i18n/availableLocales' }),
+=======
+    ...mapGetters({
+      locale: 'i18n/selectedLocaleLabel', availableLocales: 'i18n/availableLocales', hasMultipleLocales: 'i18n/hasMultipleLocales'
+    }),
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     ...mapGetters('type-map', ['activeProducts']),
 
     afterLoginRoute: mapPref(AFTER_LOGIN_ROUTE),
@@ -678,9 +688,15 @@ export default {
           >
             {{ displayVersion }}
           </span>
+<<<<<<< HEAD
 
           <span v-if="isSingleProduct">
             <v-popover
+=======
+          <span v-if="isSingleProduct">
+            <v-popover
+              v-if="hasMultipleLocales"
+>>>>>>> b5455bcb (fix: separate used/allocated units)
               popover-class="localeSelector"
               placement="top"
               trigger="click"
@@ -901,10 +917,17 @@ export default {
 
     NAV .footer {
       margin: 20px;
+<<<<<<< HEAD
 
       display: flex;
       flex: 0;
       flex-direction: row;
+=======
+      display: flex;
+      flex: 0;
+      flex-direction: row;
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       > * {
         flex: 1;
         color: var(--link);
diff --git a/shell/list/cis.cattle.io.clusterscan.vue b/shell/list/cis.cattle.io.clusterscan.vue
index ad3b00a9ee5..93a191f976e 100644
--- a/shell/list/cis.cattle.io.clusterscan.vue
+++ b/shell/list/cis.cattle.io.clusterscan.vue
@@ -1,8 +1,17 @@
 <script>
+<<<<<<< HEAD
 import ResourceTable from '@shell/components/ResourceTable';
 import { get } from '@shell/utils/object';
 import { AGE } from '@shell/config/table-headers';
 import ResourceFetch from '@shell/mixins/resource-fetch';
+=======
+import Vue from 'vue';
+import ResourceTable from '@shell/components/ResourceTable';
+import { AGE } from '@shell/config/table-headers';
+import ResourceFetch from '@shell/mixins/resource-fetch';
+import { allHash } from '@shell/utils/promise';
+import { fetchSpecsScheduledScanConfig } from '@shell/models/cis.cattle.io.clusterscan';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 export default {
   components: { ResourceTable },
@@ -25,12 +34,27 @@ export default {
   },
 
   async fetch() {
+<<<<<<< HEAD
     await this.$fetchType(this.resource);
+=======
+    // Fetch the list and schema resource fields in parallel
+    const res = await allHash({
+      resources:              this.$fetchType(this.resource),
+      hasScheduledScanConfig: fetchSpecsScheduledScanConfig(this.schema),
+    });
+
+    Vue.set(this, 'hasScheduledScanConfig', res.hasScheduledScanConfig);
+  },
+
+  data() {
+    return { hasScheduledScanConfig: null };
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   },
 
   computed: {
     // warning state and scheduling added in the same version of cis so a check for one is a check for the other
     hasWarningState() {
+<<<<<<< HEAD
       const specSchema = this.$store.getters['cluster/schemaFor'](get(this.schema, 'resourceFields.spec.type') || '');
 
       if (!specSchema) {
@@ -38,6 +62,9 @@ export default {
       }
 
       return !!get(specSchema, 'resourceFields.scheduledScanConfig');
+=======
+      return this.hasScheduledScanConfig;
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     },
 
     headers() {
@@ -64,7 +91,11 @@ export default {
     :schema="schema"
     :rows="rows"
     :headers="headers"
+<<<<<<< HEAD
     :loading="loading"
+=======
+    :loading="$fetchState.pending"
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
     :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
   />
diff --git a/shell/list/namespace.vue b/shell/list/namespace.vue
index d1eeae56804..d390f232ecd 100644
--- a/shell/list/namespace.vue
+++ b/shell/list/namespace.vue
@@ -1,7 +1,13 @@
 <script>
 import { mapGetters } from 'vuex';
+<<<<<<< HEAD
 import ResourceTable from '@shell/components/ResourceTable';
 
+=======
+import { NS_SNAPSHOT_QUOTA } from '../config/table-headers';
+import ResourceTable from '@shell/components/ResourceTable';
+import { HCI } from '@shell/config/types';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 export default {
   name:       'ListNamespace',
   components: { ResourceTable },
@@ -27,6 +33,7 @@ export default {
       default: false
     }
   },
+<<<<<<< HEAD
   data() {
     return { asddsa: true };
   },
@@ -34,6 +41,25 @@ export default {
   computed: {
     ...mapGetters(['currentProduct']),
 
+=======
+
+  computed: {
+    ...mapGetters(['currentProduct']),
+    hasHarvesterResourceQuotaSchema() {
+      const inStore = this.$store.getters['currentProduct'].inStore;
+
+      return !!this.$store.getters[`${ inStore }/schemaFor`](HCI.RESOURCE_QUOTA);
+    },
+    headers() {
+      const headersFromSchema = this.$store.getters['type-map/headersFor'](this.schema);
+
+      if (this.hasHarvesterResourceQuotaSchema) {
+        headersFromSchema.splice(2, 0, NS_SNAPSHOT_QUOTA);
+      }
+
+      return headersFromSchema;
+    },
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     filterRow() {
       if (this.currentProduct.hideSystemResources) {
         return this.rows.filter( (N) => {
@@ -56,6 +82,10 @@ export default {
     v-bind="$attrs"
     :rows="filterRow"
     :groupable="false"
+<<<<<<< HEAD
+=======
+    :headers="headers"
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     :schema="schema"
     key-field="_key"
     :loading="loading"
diff --git a/shell/machine-config/generic.vue b/shell/machine-config/generic.vue
index fc82064c247..4e734c81de6 100644
--- a/shell/machine-config/generic.vue
+++ b/shell/machine-config/generic.vue
@@ -29,11 +29,19 @@ export default {
     },
   },
 
+<<<<<<< HEAD
   fetch() {
     this.errors = [];
 
     try {
       this.fields = this.$store.getters['plugins/fieldsForDriver'](this.provider);
+=======
+  async fetch() {
+    this.errors = [];
+
+    try {
+      this.fields = await this.$store.getters['plugins/fieldsForDriver'](this.provider);
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       const name = `rke-machine-config.cattle.io.${ this.provider }config`;
 
       if ( !this.fields ) {
@@ -42,6 +50,18 @@ export default {
     } catch (e) {
       this.errors = exceptionToErrorsArray(e);
     }
+<<<<<<< HEAD
+=======
+
+    const normanType = this.$store.getters['plugins/credentialFieldForDriver'](this.provider);
+    const normanSchema = this.$store.getters['rancher/schemaFor'](`${ normanType }credentialconfig`);
+
+    if ( normanSchema ) {
+      this.cloudCredentialKeys = Object.keys(normanSchema.resourceFields || {});
+    } else {
+      this.cloudCredentialKeys = await this.$store.getters['plugins/fieldNamesForDriver'](this.provider);
+    }
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   },
 
   data() {
@@ -51,6 +71,7 @@ export default {
     };
   },
 
+<<<<<<< HEAD
   computed: {
     cloudCredentialKeys() {
       const normanType = this.$store.getters['plugins/credentialFieldForDriver'](this.provider);
@@ -64,6 +85,8 @@ export default {
     }
   },
 
+=======
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   watch: {
     'credentialId'() {
       this.$fetch();
diff --git a/shell/middleware/authenticated.js b/shell/middleware/authenticated.js
index b2f72431c4c..024d3572350 100644
--- a/shell/middleware/authenticated.js
+++ b/shell/middleware/authenticated.js
@@ -15,6 +15,7 @@ import dynamicPluginLoader from '@shell/pkg/dynamic-plugin-loader';
 import { AFTER_LOGIN_ROUTE, WORKSPACE } from '@shell/store/prefs';
 import { BACK_TO } from '@shell/config/local-storage';
 import { NAME as FLEET_NAME } from '@shell/config/product/fleet.js';
+<<<<<<< HEAD
 
 const getPackageFromRoute = (route) => {
   if (!route?.meta) {
@@ -72,6 +73,13 @@ export function getProductFromRoute(to) {
 }
 
 function setProduct(store, to) {
+=======
+import { getClusterFromRoute, getProductFromRoute, getPackageFromRoute } from '@shell/utils/router';
+
+let beforeEachSetup = false;
+
+function setProduct(store, to, redirect) {
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   let product = getProductFromRoute(to);
 
   if ( !product ) {
diff --git a/shell/mixins/auth-config.js b/shell/mixins/auth-config.js
index 0c7a29e1e42..94ab4c133ff 100644
--- a/shell/mixins/auth-config.js
+++ b/shell/mixins/auth-config.js
@@ -196,7 +196,11 @@ export default {
           }
         }
         if (wasEnabled && configType === 'oauth') {
+<<<<<<< HEAD
           await this.model.save({ ignoreFields: ['oauthCredential', 'serviceAccountCredential'] });
+=======
+          await this.model.save({ ignoreFields: ['oauthCredential', 'serviceAccountCredential'] } );
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         } else {
           await this.model.save();
         }
diff --git a/shell/models/__tests__/schema.tests.ts b/shell/models/__tests__/schema.tests.ts
new file mode 100644
index 00000000000..ce3cbf7dd17
--- /dev/null
+++ b/shell/models/__tests__/schema.tests.ts
@@ -0,0 +1,24 @@
+import { parseType } from '@shell/models/schema';
+
+describe('class: schema:', () => {
+  describe('parseType', () => {
+    it.each([
+      ['array', undefined, ['array']],
+      ['map', undefined, ['map']],
+      ['io.cattle.provisioning.v1.Cluster.status', undefined, ['io.cattle.provisioning.v1.Cluster.status']],
+
+      ['array[string]', undefined, ['array', 'string']],
+      ['array', { subtype: 'string' }, ['array', 'string']],
+      ['map[string]', undefined, ['map', 'string']],
+      ['map', { subtype: 'string' }, ['map', 'string']],
+
+      ['array[io.cattle.provisioning.v1.Cluster.status]', undefined, ['array', 'io.cattle.provisioning.v1.Cluster.status']],
+      ['array', { subtype: 'io.cattle.provisioning.v1.Cluster.status' }, ['array', 'io.cattle.provisioning.v1.Cluster.status']],
+      ['map[io.cattle.provisioning.v1.Cluster.status]', undefined, ['map', 'io.cattle.provisioning.v1.Cluster.status']],
+      ['map', { subtype: 'io.cattle.provisioning.v1.Cluster.status' }, ['map', 'io.cattle.provisioning.v1.Cluster.status']],
+
+    ])('string: %p and field: %p ... should equal %p', (val, field, expected) => {
+      expect(parseType(val, field)).toStrictEqual(expected);
+    });
+  });
+});
diff --git a/shell/models/__tests__/steve-schema.test.ts b/shell/models/__tests__/steve-schema.test.ts
new file mode 100644
index 00000000000..6108fc7289d
--- /dev/null
+++ b/shell/models/__tests__/steve-schema.test.ts
@@ -0,0 +1,73 @@
+import SteveSchema from '@shell/models/steve-schema';
+import { replace } from '@shell/plugins/dashboard-store/mutations';
+
+describe('class SteveSchema', () => {
+  describe('schema diet', () => {
+    it('schema Definitions', async() => {
+      const store = 'cluster';
+      const schemaName = 'steveTest';
+
+      SteveSchema.reset(store);
+
+      const testSchema = {
+        id:             schemaName,
+        metadata:       { name: schemaName },
+        resourceFields: null,
+        links:          { self: `/v1/schemas/${ schemaName }` }
+      };
+      const testSchemaDefinition = {
+        type:           schemaName,
+        resourceFields: {
+          a: {},
+          b: {},
+        }
+      };
+      const testSecondarySchemaDefinitions = {
+        a: { type: 'a' },
+        b: { type: 'b' }
+      };
+
+      const schemaModel = new SteveSchema(testSchema, {
+        dispatch: jest.fn().mockImplementation((action, opts) => {
+          expect(action).toBe('request');
+          expect(opts.type).toBe('schemaDefinition');
+          expect(opts.url).toBe(`/v1/schemaDefinitions/${ schemaName }`);
+
+          return {
+            definitionType: schemaName,
+            definitions:    {
+              [schemaName]: testSchemaDefinition,
+              ...testSecondarySchemaDefinitions,
+            }
+          };
+        }),
+        state: { config: { namespace: store } }
+      });
+
+      // We have no schema definition info, however we know that schema definitions should be fetched
+      expect(schemaModel.schemaDefinition).toBeNull();
+      expect(schemaModel.schemaDefinitions).toBeNull();
+      expect(schemaModel.requiresResourceFields).toBeTruthy();
+      expect(schemaModel.hasResourceFields).toBeFalsy();
+
+      // Fetch schema definition
+      await schemaModel.fetchResourceFields();
+
+      // We have schema definition info
+      expect(schemaModel.schemaDefinition).toStrictEqual(testSchemaDefinition);
+      expect(schemaModel.schemaDefinitions).toStrictEqual(testSecondarySchemaDefinitions);
+      expect(schemaModel.requiresResourceFields).toBeTruthy();
+      expect(schemaModel.hasResourceFields).toBeTruthy();
+
+      // Uhoh, there's been an update over socket. Socket process calls the `load` mutator which then calls `replace`.
+      // This wipes out ALL properties on our poor schema model and applies everything from the one we get over socket
+      replace(schemaModel, { ...testSchema });
+
+      // All schema definition info should still work (this matches above)
+      expect(schemaModel.schemaDefinition).toStrictEqual(testSchemaDefinition);
+      expect(schemaModel.schemaDefinitions).toStrictEqual(testSecondarySchemaDefinitions);
+      expect(schemaModel.requiresResourceFields).toBeTruthy();
+      expect(schemaModel.hasResourceFields).toBeTruthy();
+    });
+  });
+});
diff --git a/shell/models/cis.cattle.io.clusterscan.js b/shell/models/cis.cattle.io.clusterscan.js
index 0cdf934675b..8cc7ff0d311 100644
--- a/shell/models/cis.cattle.io.clusterscan.js
+++ b/shell/models/cis.cattle.io.clusterscan.js
@@ -7,6 +7,37 @@ import { sortBy } from '@shell/utils/sort';
 import day from 'dayjs';
 import SteveModel from '@shell/plugins/steve/steve-class';
 
+<<<<<<< HEAD
+=======
+// This could be removed and just replaced with schema.fetchResourceFields()... but there's some getters that use hasSpecsScheduledScanConfig before it runs
+/**
+ * For the given schema, determine if the schema of it's associated scan's type has scheduledScanConfig
+ *
+ * This is resourceFields based, so we need to fetch schema definition
+ */
+export const fetchSpecsScheduledScanConfig = async(schema) => {
+  await schema.fetchResourceFields();
+
+  return hasSpecsScheduledScanConfig(schema);
+};
+
+/**
+ * For the given schema, determine if the schema of it's associated scan's type has scheduledScanConfig
+ *
+ * Assumes schemaDefinitions have been fetched (see async fetchSpecsScheduledScanConfig above)
+ */
+export const hasSpecsScheduledScanConfig = (schema) => {
+  const specSchemaId = get(schema, 'resourceFields.spec.type');
+  const specSchema = schema.schemaDefinitions?.[specSchemaId];
+
+  if (!specSchema) {
+    return false;
+  }
+
+  return !!get(specSchema, 'resourceFields.scheduledScanConfig');
+};
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 export default class ClusterScan extends SteveModel {
   get _availableActions() {
     let out = super._availableActions;
@@ -64,6 +95,7 @@ export default class ClusterScan extends SteveModel {
   }
 
   canBeScheduled() {
+<<<<<<< HEAD
     const schema = this.$getters['schemaFor'](this.type);
     const specSchema = this.$getters['schemaFor'](get(schema, 'resourceFields.spec.type') || '');
 
@@ -72,6 +104,9 @@ export default class ClusterScan extends SteveModel {
     }
 
     return !!get(specSchema, 'resourceFields.scheduledScanConfig');
+=======
+    return hasSpecsScheduledScanConfig(this.$getters['schemaFor'](this.type));
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   }
 
   get isScheduled() {
diff --git a/shell/models/cluster/schema.js b/shell/models/cluster/schema.js
new file mode 100644
index 00000000000..2f02c5c5dd7
--- /dev/null
+++ b/shell/models/cluster/schema.js
@@ -0,0 +1,6 @@
+import SteveSchema from '../steve-schema';
+
+/**
+ * This is the steve schema that's used for the cluster store
+ */
+export default class ClusterStoreSchema extends SteveSchema { }
diff --git a/shell/models/harvester/schema.js b/shell/models/harvester/schema.js
new file mode 100644
index 00000000000..4838c22e8a5
--- /dev/null
+++ b/shell/models/harvester/schema.js
@@ -0,0 +1,6 @@
+import SteveSchema from '../steve-schema';
+
+/**
+ * This is the steve schema that's used for the harvester store
+ */
+export default class HarvesterStoreSchema extends SteveSchema { }
diff --git a/shell/models/management/schema.js b/shell/models/management/schema.js
new file mode 100644
index 00000000000..9d1af920970
--- /dev/null
+++ b/shell/models/management/schema.js
@@ -0,0 +1,6 @@
+import SteveSchema from '../steve-schema';
+
+/**
+ * This is the steve schema that's used for the management store
+ */
+export default class ManagementStoreSchema extends SteveSchema { }
diff --git a/shell/models/monitoring.coreos.com.receiver.js b/shell/models/monitoring.coreos.com.receiver.js
index 7aa8182da98..72986ff0cfd 100644
--- a/shell/models/monitoring.coreos.com.receiver.js
+++ b/shell/models/monitoring.coreos.com.receiver.js
@@ -66,7 +66,11 @@ export default class Receiver extends SteveModel {
   }
 
   async save() {
+<<<<<<< HEAD
     const errors = await this.validationErrors(this);
+=======
+    const errors = this.validationErrors(this);
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
     if (!isEmpty(errors)) {
       return Promise.reject(errors);
diff --git a/shell/models/monitoring.coreos.com.route.js b/shell/models/monitoring.coreos.com.route.js
index 909044a3cd6..4746ef8dfbf 100644
--- a/shell/models/monitoring.coreos.com.route.js
+++ b/shell/models/monitoring.coreos.com.route.js
@@ -34,7 +34,11 @@ export default class Route extends SteveModel {
   }
 
   async save() {
+<<<<<<< HEAD
     const errors = await this.validationErrors(this);
+=======
+    const errors = this.validationErrors(this);
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
     if (!isEmpty(errors)) {
       return Promise.reject(errors);
diff --git a/shell/models/namespace.js b/shell/models/namespace.js
index f9370d31134..0146ab81d32 100644
--- a/shell/models/namespace.js
+++ b/shell/models/namespace.js
@@ -71,9 +71,31 @@ export default class Namespace extends SteveModel {
       });
     }
 
+<<<<<<< HEAD
     return out;
   }
 
+=======
+    insertAt(out, 5, {
+      action:  'editNSQuota',
+      label:   this.t('harvester.modal.quota.editQuota'),
+      icon:    'icon icon-storage',
+      enabled: !!this?.actions?.updateResourceQuota && !!this?.actions?.deleteResourceQuota,
+      weight:  4,
+    });
+
+    return out;
+  }
+
+  editNSQuota(resources = this) {
+    this.$dispatch('promptModal', {
+      resources,
+      snapshotSizeQuota: this.snapshotSizeQuota,
+      component:         'HarvesterQuotaDialog'
+    });
+  }
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   move(resources = this) {
     this.$dispatch('promptMove', resources);
   }
diff --git a/shell/models/persistentvolume.js b/shell/models/persistentvolume.js
index 979f60165a2..81bcc73b915 100644
--- a/shell/models/persistentvolume.js
+++ b/shell/models/persistentvolume.js
@@ -108,6 +108,11 @@ export const VOLUME_PLUGINS = [
 ];
 
 export const LONGHORN_DRIVER = 'driver.longhorn.io';
+<<<<<<< HEAD
+=======
+export const LONGHORN_VERSION_V1 = 'LonghornV1';
+export const LONGHORN_VERSION_V2 = 'LonghornV2';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 export const LONGHORN_PLUGIN = VOLUME_PLUGINS.find(plugin => plugin.value === 'longhorn');
 
diff --git a/shell/models/schema.js b/shell/models/schema.js
index 9ae4b63065f..f0f423cae48 100644
--- a/shell/models/schema.js
+++ b/shell/models/schema.js
@@ -6,6 +6,7 @@ export default class Schema extends Resource {
   }
 }
 
+<<<<<<< HEAD
 export function parseType(str) {
   if ( str.startsWith('array[') ) {
     return ['array', ...parseType(str.slice(6, -1))];
@@ -14,4 +15,32 @@ export function parseType(str) {
   } else {
     return [str];
   }
+=======
+/**
+ * Handles
+ * - no subtype { type: 'io.cattle.provisioning.v1.Cluster.status' }
+ * - traditional map/array's with sub type in type e.g `{ type: array[io.cattle.provisioning.v1.Cluster.status] }`
+ * - new schema definitions map/array's with sub type property e.g. `{ type: 'array', subtype: 'io.cattle.provisioning.v1.Cluster.status' }`
+ */
+const mapArrayTypeRegex = /([^[\s]*)(\[(.*)\])?/;
+
+/**
+ * For the given resourceField find the root type and, if a collection of types, it's subtype
+ *
+ * @param {String} str type, may contain sub type
+ * @param {ResourceField} field resourceField entry, may contain sub type
+ * @returns [type, subtype]
+ */
+export function parseType(str, field) {
+  const regexRes = mapArrayTypeRegex.exec(str);
+
+  const subtype = regexRes[3] || field?.subtype;
+  const res = [regexRes[1]];
+
+  if (subtype) {
+    res.push(subtype);
+  }
+
+  return res;
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 }
diff --git a/shell/models/steve-schema.ts b/shell/models/steve-schema.ts
new file mode 100644
index 00000000000..2c9e8c57842
--- /dev/null
+++ b/shell/models/steve-schema.ts
@@ -0,0 +1,259 @@
+import { STEVE } from '@shell/config/types';
+import Schema from './schema';
+import { wait } from '@shell/utils/async';
+
+interface ResourceField {
+  type: string,
+  description: string,
+}
+type ResourceFields = { [id: string]: ResourceField }
+
+interface SchemaDefinition {
+  type: string,
+  description: string,
+  resourceFields: ResourceFields
+}
+type SchemaDefinitions = { [definitionId: string]: SchemaDefinition }
+
+type SchemaId = {
+  self: string;
+  others: string[];
+}
+type SchemaIds = { [schemaId: string]: SchemaId }
+
+interface SchemaDefinitionResponse {
+  definitions: SchemaDefinitions,
+  definitionType: string,
+}
+
+const SchemaDefinitionCache: { [store: string]: {
+  ids: SchemaIds,
+  definitions: SchemaDefinitions,
+} } = {};
+
+/**
+ * Steve Schema specific functionality
+ */
+export default class SteveSchema extends Schema {
+  static reset(store: string): void {
+    delete SchemaDefinitionCache[store];
+  }
+
+  _resourceFields?: ResourceFields;
+
+  /**
+   * If resourceFields have not been provided, they are required to be fetched aka schemaDefinition world
+   */
+  requiresResourceFields: boolean;
+
+  // These are just for typing, eventually we'll get them when Schema is fully converted to typescript
+  id?: string;
+  type?: string;
+  links?: any;
+  $ctx?: any;
+
+  /**
+   * This should match the root Schema ctor (...args throws ts error)
+   */
+  constructor(data: unknown, ctx: unknown, rehydrateNamespace?: null | undefined, setClone?: boolean) {
+    super(data, ctx, rehydrateNamespace, setClone);
+
+    if (!SchemaDefinitionCache[this.store]) {
+      SchemaDefinitionCache[this.store] = {
+        ids:         {},
+        definitions: {}
+      };
+    }
+
+    this.requiresResourceFields = this._resourceFields === null; // This is set pre ctor via `set'er, but TS complains that it's not initialised
+  }
+
+  // Notes on Schemas, resourceFields and schemaDefinitions
+  // - Schemas previously contained a `resourceFields` collection, which is now null
+  // - resourceFields now come from a new `schemaDefinitions` endpoint
+  // - for neatness / safety / compatibility with norman resources... we fetch schemaDefinitions and return their resourceFields in a resourceFields getter
+
+  /******************
+   * Resource Fields
+   ****************** /
+
+  /**
+   * Is the property `resourceFields` available
+   *
+   * If the schema definition is required and it hasn't been fetched this will be false
+   *
+   * This is a non-erroring request, unlike the resourceFields getter which will error if schema definition is required but missing
+   */
+  get hasResourceFields(): boolean {
+    if (this.requiresResourceFields) {
+      return !!this.schemaDefinition?.resourceFields;
+    }
+
+    return !!this._resourceFields;
+  }
+
+  /**
+   * Fields associated with instances of this schema
+   *
+   * This will either come directly from the schema or from the schema's definition
+   */
+  get resourceFields(): ResourceFields {
+    if (this.requiresResourceFields) {
+      // workaround to avoid throw below error on Rancher 2.8.x
+      if (!this.schemaDefinitionsIds && !this.schemaDefinition) {
+        return {};
+      }
+
+      if (!this.schemaDefinitionsIds) {
+        throw new Error(`Cannot find resourceFields for Schema ${ this.id } (schemaDefinitions have not been fetched) `);
+      }
+
+      if (!this.schemaDefinition) {
+        throw new Error(`No schemaDefinition for ${ this.id } found (not in schemaDefinition response) `);
+      }
+
+      return this.schemaDefinition.resourceFields;
+    }
+
+    return this._resourceFields as ResourceFields;
+  }
+
+  /**
+   * Apply the original `resourceFields` param (if it exists). If it does not then we'll need to fetch the schema definition
+   */
+  set resourceFields(resourceFields: ResourceFields) {
+    this._resourceFields = resourceFields;
+    this.requiresResourceFields = this._resourceFields === null;
+  }
+
+  /**
+   * Ensure this schema has a populated `resourceFields` property
+   *
+   * This happens via making a request to fetch the schema definition
+   */
+  async fetchResourceFields(depth = 0): Promise<SchemaDefinition | null | undefined> {
+    if (!this.requiresResourceFields) {
+      // Not needed, no-op
+      return;
+    }
+
+    if (this.schemaDefinition) {
+      // Already have it, no-op
+      return this.schemaDefinition;
+    }
+
+    const url = this.schemaDefinitionUrl;
+
+    if (!url) {
+      console.warn(`Unable to fetch schema definitions for ${ this.id } (failed to find url of schema definition)`); // eslint-disable-line no-console
+
+      return;
+    }
+
+    if (depth >= 4) {
+      console.warn(`Unable to fetch schema definitions for ${ this.id } (too many failed requests)`); // eslint-disable-line no-console
+
+      return;
+    }
+
+    let res;
+
+    try {
+      // Make a direct request to fetch the schema definition
+      res = await this.$dispatch('request', {
+        type: STEVE.SCHEMA_DEFINITION,
+        url
+      });
+    } catch (e: any) {
+      if ( e?._status === 500) {
+        // Rancher could be updating it's definition cache, attempt a few times
+        await wait(2000);
+
+        return this.fetchResourceFields(++depth);
+      }
+
+      console.warn(`Unable to fetch schema definitions for ${ this.id }`, e); // eslint-disable-line no-console
+
+      return;
+    }
+
+    this.cacheSchemaDefinitionResponse(res);
+
+    return this.schemaDefinition;
+  }
+
+  /**
+   * Convert collection of schema definitions for this schema into objects we can store
+   *
+   * Split out for unit testing purposes
+   */
+  private cacheSchemaDefinitionResponse(res: SchemaDefinitionResponse): void {
+    const { [res.definitionType]: self, ...others } = res.definitions;
+    const store = this.store;
+
+    SchemaDefinitionCache[store].ids[this.id as string] = { self: self.type, others: Object.keys(others) };
+    Object.entries(res.definitions).forEach(([type, sd]) => {
+      SchemaDefinitionCache[store].definitions[type] = sd;
+    });
+  }
+
+  /*********************
+   * Schema Definitions
+   ********************* /
+
+  /**
+   * Store this schema's definition and a collection of associated definitions (all ids)
+   */
+
+  /**
+   * The schema definition for this schema
+   */
+  get schemaDefinition(): SchemaDefinition | null {
+    if (!this.schemaDefinitionsIds) {
+      return null;
+    }
+
+    return SchemaDefinitionCache[this.store].definitions[this.schemaDefinitionsIds.self];
+  }
+
+  /**
+   * The schema definitions for this schema definition's resourceFields
+   */
+  get schemaDefinitions(): SchemaDefinitions | null {
+    if (!this.schemaDefinitionsIds) {
+      return null;
+    }
+
+    return this.schemaDefinitionsIds.others.reduce((res, d) => {
+      res[d] = SchemaDefinitionCache[this.store].definitions[d];
+
+      return res;
+    }, {} as SchemaDefinitions);
+  }
+
+  /**
+   * URL to fetch this schema's definition
+   */
+  get schemaDefinitionUrl(): string {
+    return this.links?.self?.replace('/schemas/', '/schemaDefinitions/');
+  }
+
+  /*********************
+   * Local Properties
+   *
+   * This could be set in the ctor, however are removed in `replaceResource` when there are socket updates..
+   * ... so use getters instead
+   *
+   *********************/
+
+  /**
+   * The name (namespace) of the vuex store this schema lives in (i.e. cluster, management, etc)
+   */
+  private get store(): string {
+    return this.$ctx.state?.config?.namespace;
+  }
+
+  private get schemaDefinitionsIds(): SchemaId | undefined {
+    return SchemaDefinitionCache[this.store]?.ids[this.id as string];
+  }
+}
diff --git a/shell/package.json b/shell/package.json
index 03d7d98ac62..85de375c052 100644
--- a/shell/package.json
+++ b/shell/package.json
@@ -59,8 +59,13 @@
     "cookie": "0.5.0",
     "cookie-universal-nuxt": "2.1.4",
     "core-js": "3.21.1",
+<<<<<<< HEAD
     "cron-validator": "1.2.0",
     "cronstrue": "1.95.0",
+=======
+    "cron-validator": "1.3.1",
+    "cronstrue": "2.50.0",
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     "cross-env": "6.0.3",
     "css-loader": "6.7.3",
     "csv-loader": "3.0.3",
diff --git a/shell/pages/auth/login.vue b/shell/pages/auth/login.vue
index 6e5a976e015..51522b02d2d 100644
--- a/shell/pages/auth/login.vue
+++ b/shell/pages/auth/login.vue
@@ -130,7 +130,11 @@ export default {
   },
 
   computed: {
+<<<<<<< HEAD
     ...mapGetters({ t: 'i18n/t' }),
+=======
+    ...mapGetters({ t: 'i18n/t', hasMultipleLocales: 'i18n/hasMultipleLocales' }),
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
     nonLocalPrompt() {
       if (this.singleProvider) {
@@ -474,7 +478,14 @@ export default {
               {{ nonLocalPrompt }}
             </a>
           </div>
+<<<<<<< HEAD
           <div class="locale-elector">
+=======
+          <div
+            v-if="hasMultipleLocales"
+            class="locale-elector"
+          >
+>>>>>>> b5455bcb (fix: separate used/allocated units)
             <LocaleSelector mode="login" />
           </div>
         </template>
diff --git a/shell/pages/auth/setup.vue b/shell/pages/auth/setup.vue
index 77c8ff81197..fc1f98fc054 100644
--- a/shell/pages/auth/setup.vue
+++ b/shell/pages/auth/setup.vue
@@ -128,7 +128,11 @@ export default {
       type: MANAGEMENT.FEATURE, id: 'multi-cluster-management', opt: { url: `/v1/${ MANAGEMENT.FEATURE }/multi-cluster-management` }
     });
 
+<<<<<<< HEAD
     const mcmEnabled = (mcmFeature?.spec?.value || mcmFeature?.status?.default) && !productName === 'Harvester';
+=======
+    const mcmEnabled = (mcmFeature?.spec?.value || mcmFeature?.status?.default) && productName !== 'Harvester';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
     let serverUrl;
 
diff --git a/shell/pages/c/_cluster/_product/namespaces.vue b/shell/pages/c/_cluster/_product/namespaces.vue
index 8bf07d05c72..72b34bf6c28 100644
--- a/shell/pages/c/_cluster/_product/namespaces.vue
+++ b/shell/pages/c/_cluster/_product/namespaces.vue
@@ -68,9 +68,15 @@ export default {
     >
       <template #cell:project="{row}">
         <span v-if="row.project">{{ row.project.nameDisplay }}</span>
+<<<<<<< HEAD
         <span
           v-else
           class="text-muted"
+=======
+        <span
+          v-else
+          class="text-muted"
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         >&ndash;</span>
       </template>
     </ResourceTable>
diff --git a/shell/pages/c/_cluster/apps/charts/index.vue b/shell/pages/c/_cluster/apps/charts/index.vue
index 448cd5d0dc5..c4ac9cb025f 100644
--- a/shell/pages/c/_cluster/apps/charts/index.vue
+++ b/shell/pages/c/_cluster/apps/charts/index.vue
@@ -177,10 +177,21 @@ export default {
       });
     },
 
+<<<<<<< HEAD
     getFeaturedCharts() {
       const allCharts = (this.filteredCharts || []);
 
       const featuredCharts = allCharts.filter(value => value.featured).sort((a, b) => a.featured - b.featured);
+=======
+    /**
+     * Filter valid charts (alll filters minus user provided ones) by whether they are featured or not
+     *
+     * This will power the carousel
+     */
+    featuredCharts() {
+      const filteredCharts = this.filterCharts({});
+      const featuredCharts = filteredCharts.filter(value => value.featured).sort((a, b) => a.featured - b.featured);
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
       return featuredCharts.slice(0, 5);
     },
diff --git a/shell/pages/c/_cluster/monitoring/alertmanagerconfig/_alertmanagerconfigid/receiver.vue b/shell/pages/c/_cluster/monitoring/alertmanagerconfig/_alertmanagerconfigid/receiver.vue
index e70c548a778..a07b026ebef 100644
--- a/shell/pages/c/_cluster/monitoring/alertmanagerconfig/_alertmanagerconfigid/receiver.vue
+++ b/shell/pages/c/_cluster/monitoring/alertmanagerconfig/_alertmanagerconfigid/receiver.vue
@@ -23,12 +23,22 @@ export default {
 
   async fetch() {
     const inStore = this.$store.getters['currentProduct'].inStore;
+<<<<<<< HEAD
+=======
+    const alertmanagerConfigSchema = this.$store.getters[`${ inStore }/schemaFor`](MONITORING.ALERTMANAGERCONFIG);
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
     this.receiverName = this.$route.query.receiverName;
 
     const alertmanagerConfigId = this.$route.params.alertmanagerconfigid;
     const originalAlertmanagerConfigResource = await this.$store.dispatch(`${ inStore }/find`, { type: MONITORING.ALERTMANAGERCONFIG, id: alertmanagerConfigId });
     const alertmanagerConfigResource = await this.$store.dispatch(`${ inStore }/clone`, { resource: originalAlertmanagerConfigResource });
+<<<<<<< HEAD
+=======
+
+    await alertmanagerConfigSchema.fetchResourceFields();
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     const mode = this.$route.query.mode;
 
     if (mode !== _CREATE) {
diff --git a/shell/pages/prefs.vue b/shell/pages/prefs.vue
index 47bf6e49e07..0f431d00a9f 100644
--- a/shell/pages/prefs.vue
+++ b/shell/pages/prefs.vue
@@ -39,6 +39,10 @@ export default {
     scalingDownPrompt: mapPref(SCALE_POOL_PROMPT),
 
     ...mapGetters(['isSingleProduct']),
+<<<<<<< HEAD
+=======
+    ...mapGetters({ hasMultipleLocales: 'i18n/hasMultipleLocales' }),
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
     theme: {
       get() {
@@ -177,7 +181,14 @@ export default {
       class="mb-20"
     />
     <!-- Language -->
+<<<<<<< HEAD
     <div class="mt-10 mb-10">
+=======
+    <div
+      v-if="hasMultipleLocales"
+      class="mt-10 mb-10"
+    >
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       <h4 v-t="'prefs.language'" />
       <div class="row">
         <div class="col span-4">
@@ -189,7 +200,10 @@ export default {
     </div>
     <!-- Theme -->
     <div class="mt-10 mb-10">
+<<<<<<< HEAD
       <hr>
+=======
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       <h4 v-t="'prefs.theme.label'" />
       <ButtonGroup
         v-model="theme"
diff --git a/shell/plugins/dashboard-store/actions.js b/shell/plugins/dashboard-store/actions.js
index 7c1660cc355..268cdba56d7 100644
--- a/shell/plugins/dashboard-store/actions.js
+++ b/shell/plugins/dashboard-store/actions.js
@@ -540,8 +540,20 @@ export default {
     return data.map(d => classify(ctx, d));
   },
 
+<<<<<<< HEAD
   createPopulated(ctx, userData) {
     const data = ctx.getters['defaultFor'](userData.type);
+=======
+  async createPopulated(ctx, userData) {
+    let data = null;
+
+    const schema = ctx.getters['schemaFor'](userData.type);
+
+    if (schema) {
+      await schema.fetchResourceFields();
+      data = ctx.getters['defaultFor'](userData.type, schema);
+    }
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
     merge(data, userData);
 
diff --git a/shell/plugins/dashboard-store/getters.js b/shell/plugins/dashboard-store/getters.js
index 857dc7ee0a2..4b13b337086 100644
--- a/shell/plugins/dashboard-store/getters.js
+++ b/shell/plugins/dashboard-store/getters.js
@@ -3,8 +3,11 @@ import { SCHEMA } from '@shell/config/types';
 
 import { matches } from '@shell/utils/selector';
 import { typeMunge, typeRef, SIMPLE_TYPES } from '@shell/utils/create-yaml';
+<<<<<<< HEAD
 import { splitObjectPath } from '@shell/utils/string';
 import { parseType } from '@shell/models/schema';
+=======
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 import Resource from '@shell/plugins/dashboard-store/resource-class';
 import mutations from './mutations';
 import { keyFieldFor, normalizeType } from './normalize';
@@ -94,6 +97,7 @@ export default {
     }
   },
 
+<<<<<<< HEAD
   pathExistsInSchema: (state, getters) => (type, path) => {
     let schema = getters.schemaFor(type);
     const parts = splitObjectPath(path);
@@ -118,6 +122,15 @@ export default {
     }
 
     return true;
+=======
+  /**
+   * Checks a schema for the given path
+   *
+   * Given that schema are primarily a rancher thing most logic is in the `steve` store
+   */
+  pathExistsInSchema: (state, getters) => (type, path) => {
+    return false;
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   },
 
   // @TODO resolve difference between this and schemaFor and have only one of them.
@@ -188,17 +201,39 @@ export default {
     return out;
   },
 
+<<<<<<< HEAD
   defaultFor: (state, getters) => (type) => {
     const schema = getters['schemaFor'](type);
 
     if ( !schema ) {
       return null;
+=======
+  defaultFor: (state, getters) => (type, rootSchema, schemaDefinitions = null) => {
+    let resourceFields;
+
+    if (!schemaDefinitions) {
+      // Depth 0. Get the schemaDefinitions that will contain the child schema resourceFields for recursive calls
+
+      schemaDefinitions = rootSchema.schemaDefinitions || {}; // norman...
+      resourceFields = rootSchema.resourceFields || {};
+    } else if (rootSchema.requiresResourceFields) {
+      resourceFields = schemaDefinitions[type]?.resourceFields || {};
+    } else {
+      const schema = getters['schemaFor'](type);
+
+      resourceFields = schema?.resourceFields || {};
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     }
 
     const out = {};
 
+<<<<<<< HEAD
     for ( const key in schema.resourceFields ) {
       const field = schema.resourceFields[key];
+=======
+    for ( const key in resourceFields ) {
+      const field = resourceFields[key];
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
       if ( !field ) {
         // Not much to do here...
@@ -206,12 +241,21 @@ export default {
       }
 
       const type = typeMunge(field.type);
+<<<<<<< HEAD
       const mapOf = typeRef('map', type);
       const arrayOf = typeRef('array', type);
       const referenceTo = typeRef('reference', type);
 
       if ( mapOf || type === 'map' || type === 'json' ) {
         out[key] = getters.defaultFor(type);
+=======
+      const mapOf = typeRef('map', type, field);
+      const arrayOf = typeRef('array', type, field);
+      const referenceTo = typeRef('reference', type);
+
+      if ( mapOf || type === 'map' || type === 'json' ) {
+        out[key] = getters.defaultFor(type, rootSchema, schemaDefinitions);
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       } else if ( arrayOf || type === 'array' ) {
         out[key] = [];
       } else if ( referenceTo ) {
@@ -223,7 +267,11 @@ export default {
           out[key] = field['default'];
         }
       } else {
+<<<<<<< HEAD
         out[key] = getters.defaultFor(type);
+=======
+        out[key] = getters.defaultFor(type, rootSchema, schemaDefinitions);
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       }
     }
 
diff --git a/shell/plugins/dashboard-store/resource-class.js b/shell/plugins/dashboard-store/resource-class.js
index 57d66d44a5f..d59d186e471 100644
--- a/shell/plugins/dashboard-store/resource-class.js
+++ b/shell/plugins/dashboard-store/resource-class.js
@@ -16,10 +16,15 @@ import { downloadFile, generateZip } from '@shell/utils/download';
 import { clone, get } from '@shell/utils/object';
 import { eachLimit } from '@shell/utils/promise';
 import { sortableNumericSuffix } from '@shell/utils/sort';
+<<<<<<< HEAD
 import { coerceStringTypeToScalarType, escapeHtml, ucFirst } from '@shell/utils/string';
 import {
   displayKeyFor,
   validateBoolean,
+=======
+import { escapeHtml, ucFirst } from '@shell/utils/string';
+import {
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   validateChars,
   validateDnsLikeTypes,
   validateLength,
@@ -32,6 +37,7 @@ import forIn from 'lodash/forIn';
 import isEmpty from 'lodash/isEmpty';
 import isFunction from 'lodash/isFunction';
 import isString from 'lodash/isString';
+<<<<<<< HEAD
 import uniq from 'lodash/uniq';
 import Vue from 'vue';
 
@@ -52,6 +58,14 @@ const STRING_LIKE_TYPES = [
   'hostname',
 ];
 const DNS_LIKE_TYPES = ['dnsLabel', 'dnsLabelRestricted', 'hostname'];
+=======
+import Vue from 'vue';
+
+import { ExtensionPoint, ActionLocation } from '@shell/core/types';
+import { getApplicableExtensionEnhancements } from '@shell/core/plugin-helpers';
+
+export const DNS_LIKE_TYPES = ['dnsLabel', 'dnsLabelRestricted', 'hostname'];
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 const REMAP_STATE = {
   disabled:                 'inactive',
@@ -1070,6 +1084,7 @@ export default class Resource {
    */
   processSaveResponse(res) { }
 
+<<<<<<< HEAD
   async _save(opt = {}) {
     delete this.__rehydrate;
     delete this.__clone;
@@ -1077,6 +1092,12 @@ export default class Resource {
     const forNew = !this.id;
 
     const errors = await this.validationErrors(this, opt.ignoreFields);
+=======
+  async _save(opt = { }) {
+    const forNew = !this.id;
+
+    const errors = this.validationErrors(this, opt);
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
     if (!isEmpty(errors)) {
       return Promise.reject(errors);
@@ -1607,6 +1628,7 @@ export default class Resource {
     return errors;
   }
 
+<<<<<<< HEAD
   validationErrors(data = this, ignoreFields) {
     const errors = [];
     const {
@@ -1694,6 +1716,16 @@ export default class Resource {
     }
 
     return uniq([...errors, ...this.customValidationErrors(data)]);
+=======
+  /**
+   * Check this instance is valid against
+   * - any custom dashboard validation
+   *
+   * Models can override this and call super.validationErrors
+   */
+  validationErrors(data = this, opts = { }) {
+    return this.customValidationErrors(data);
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   }
 
   get ownersByType() {
diff --git a/shell/plugins/steve/getters.js b/shell/plugins/steve/getters.js
index f64ade14dbf..0ef951b0c96 100644
--- a/shell/plugins/steve/getters.js
+++ b/shell/plugins/steve/getters.js
@@ -9,6 +9,11 @@ import NormanModel from './norman-class';
 import { urlFor } from '@shell/plugins/dashboard-store/getters';
 import { normalizeType } from '@shell/plugins/dashboard-store/normalize';
 import pAndNFiltering from '@shell/utils/projectAndNamespaceFiltering.utils';
+<<<<<<< HEAD
+=======
+import { splitObjectPath } from '@shell/utils/string';
+import { parseType } from '@shell/models/schema';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 export const STEVE_MODEL_TYPES = {
   NORMAN:  'norman',
@@ -176,4 +181,49 @@ export default {
     return cache.generation;
   },
 
+<<<<<<< HEAD
+=======
+  /**
+   * Checks the norman or steve schema resourceFields for the given path
+   */
+  pathExistsInSchema: (state, getters) => (type, path) => {
+    const schema = getters.schemaFor(type);
+
+    if (schema.requiresResourceFields && !schema.hasResourceFields) {
+      console.warn(`pathExistsInSchema requires schema ${ schema.id } to have resources fields via schema definition but none were found. has the schema 'fetchResourceFields' been called?`); // eslint-disable-line no-console
+
+      return false;
+    }
+
+    const schemaDefinitions = schema.requiresResourceFields ? schema.schemaDefinitions : null;
+    const parts = splitObjectPath(path);
+    let schemaOrSchemaDefinition = schema;
+
+    // Iterate down the parts (properties) until there are no parts left (success) or the path cannot be found (failure)
+    while ( parts.length ) {
+      const key = parts.shift();
+
+      const field = schemaOrSchemaDefinition.resourceFields?.[key];
+
+      type = field?.type;
+
+      if ( !type ) {
+        return false;
+      }
+
+      if ( parts.length ) {
+        type = parseType(type, field).pop(); // Get the main part of array[map[something]] => something
+
+        schemaOrSchemaDefinition = schemaDefinitions ? schemaDefinitions?.[type] : getters.schemaFor(type);
+
+        if ( !schema ) {
+          return false;
+        }
+      }
+    }
+
+    return true;
+  },
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 };
diff --git a/shell/plugins/steve/mutations.js b/shell/plugins/steve/mutations.js
index 0f056a2cd67..8e54c7cc8a9 100644
--- a/shell/plugins/steve/mutations.js
+++ b/shell/plugins/steve/mutations.js
@@ -13,6 +13,10 @@ import { keyForSubscribe } from '@shell/plugins/steve/resourceWatcher';
 import { perfLoadAll } from '@shell/plugins/steve/performanceTesting';
 import Vue from 'vue';
 import { classify } from '@shell/plugins/dashboard-store/classify';
+<<<<<<< HEAD
+=======
+import SteveSchema from '@shell/models/steve-schema';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 function registerNamespace(state, namespace) {
   let cache = state.podsByNamespace[namespace];
@@ -156,11 +160,23 @@ export default {
   },
 
   reset(state) {
+<<<<<<< HEAD
     resetStore(state, this.commit);
+=======
+    // Reset generic store things.... then steve specific things
+
+    resetStore(state, this.commit);
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     this.commit(`${ state.config.namespace }/resetSubscriptions`);
 
     // Clear the podsByNamespace cache
     state.podsByNamespace = {};
+<<<<<<< HEAD
+=======
+
+    SteveSchema.reset(state.config.namespace);
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   },
 
   loadMulti(state, { data, ctx }) {
diff --git a/shell/plugins/steve/norman-class.js b/shell/plugins/steve/norman-class.js
index 9f7c4b4b541..e544a78421e 100644
--- a/shell/plugins/steve/norman-class.js
+++ b/shell/plugins/steve/norman-class.js
@@ -1,8 +1,39 @@
 import { ANNOTATIONS_TO_IGNORE_REGEX, LABELS_TO_IGNORE_REGEX } from '@shell/config/labels-annotations';
 import pickBy from 'lodash/pickBy';
 import Vue from 'vue';
+<<<<<<< HEAD
 import { matchesSomeRegex } from '@shell/utils/string';
 import Resource from '@shell/plugins/dashboard-store/resource-class';
+=======
+import { findBy } from '@shell/utils/array';
+import { matchesSomeRegex, coerceStringTypeToScalarType } from '@shell/utils/string';
+import Resource, { DNS_LIKE_TYPES } from '@shell/plugins/dashboard-store/resource-class';
+import { get } from '@shell/utils/object';
+import {
+  displayKeyFor,
+  validateBoolean,
+  validateChars,
+  validateDnsLikeTypes,
+  validateLength,
+} from '@shell/utils/validators';
+import { normalizeType } from '@shell/plugins/dashboard-store/normalize';
+import isString from 'lodash/isString';
+import uniq from 'lodash/uniq';
+
+import isEmpty from 'lodash/isEmpty';
+
+const STRING_LIKE_TYPES = [
+  'string',
+  'date',
+  'blob',
+  'enum',
+  'multiline',
+  'masked',
+  'password',
+  'dnsLabel',
+  'hostname',
+];
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 export default class NormanModel extends Resource {
   setLabels(val) {
@@ -56,4 +87,121 @@ export default class NormanModel extends Resource {
       Vue.set(this, key, { ...spec[key] });
     });
   }
+<<<<<<< HEAD
+=======
+
+  isCondition(condition, withStatus = 'True') {
+    if ( !this.conditions ) {
+      return false;
+    }
+
+    const entry = findBy((this.conditions || []), 'type', condition);
+
+    if ( !entry ) {
+      return false;
+    }
+
+    if ( !withStatus ) {
+      return true;
+    }
+
+    return (entry.status || '').toLowerCase() === `${ withStatus }`.toLowerCase();
+  }
+
+  /**
+   * Check this instance is valid against
+   * - the schema's resource fields
+   * - also calls super.validationErrors
+   */
+  validationErrors(data = this, opt = { ignoreFields: undefined }) {
+    const errors = [];
+    const {
+      type: originalType,
+      schema
+    } = data;
+    const type = normalizeType(originalType);
+
+    if ( !originalType ) {
+      // eslint-disable-next-line
+      console.warn(this.t('validation.noType'), data);
+
+      return errors;
+    }
+
+    if ( !schema ) {
+      // eslint-disable-next-line
+      // console.warn(this.t('validation.noSchema'), originalType, data);
+
+      return errors;
+    }
+
+    const fields = schema.resourceFields || {};
+    const keys = Object.keys(fields);
+    let field, key, val, displayKey;
+
+    for ( let i = 0 ; i < keys.length ; i++ ) {
+      const fieldErrors = [];
+
+      key = keys[i];
+      field = fields[key];
+      val = get(data, key);
+      displayKey = displayKeyFor(type, key, this.$rootGetters);
+
+      const fieldType = field?.type ? normalizeType(field.type) : null;
+      const valIsString = isString(val);
+
+      if ( opt.ignoreFields && opt.ignoreFields.includes(key) ) {
+        continue;
+      }
+
+      if ( val === undefined ) {
+        val = null;
+      }
+
+      if (valIsString) {
+        if (fieldType) {
+          Vue.set(data, key, coerceStringTypeToScalarType(val, fieldType));
+        }
+
+        // Empty strings on nullable string fields -> null
+        if ( field.nullable && val.length === 0 && STRING_LIKE_TYPES.includes(fieldType)) {
+          val = null;
+
+          Vue.set(data, key, val);
+        }
+      }
+      if (fieldType === 'boolean') {
+        validateBoolean(val, field, displayKey, this.$rootGetters, fieldErrors);
+      } else {
+        validateLength(val, field, displayKey, this.$rootGetters, fieldErrors);
+        validateChars(val, field, displayKey, this.$rootGetters, fieldErrors);
+      }
+
+      if (fieldErrors.length > 0) {
+        fieldErrors.push(this.t('validation.required', { key: displayKey }));
+        errors.push(...fieldErrors);
+        continue;
+      }
+
+      // IDs claim to be these but are lies...
+      if ( key !== 'id' && !isEmpty(val) && DNS_LIKE_TYPES.includes(fieldType) ) {
+        // DNS types should be lowercase
+        const tolower = (val || '').toLowerCase();
+
+        if ( tolower !== val ) {
+          val = tolower;
+
+          Vue.set(data, key, val);
+        }
+
+        fieldErrors.push(...validateDnsLikeTypes(val, fieldType, displayKey, this.$rootGetters, fieldErrors));
+      }
+      errors.push(...fieldErrors);
+    }
+
+    const rootErrors = super.validationErrors(this, opt);
+
+    return uniq([...errors, ...rootErrors]);
+  }
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 }
diff --git a/shell/scripts/test-plugins-build.sh b/shell/scripts/test-plugins-build.sh
index 461e6070883..94e75236a35 100755
--- a/shell/scripts/test-plugins-build.sh
+++ b/shell/scripts/test-plugins-build.sh
@@ -25,8 +25,12 @@ if [ $SKIP_SETUP == "false" ]; then
 
   if [ $RET -ne 0 ]; then
     echo "Verdaccio not installed"
+<<<<<<< HEAD
 
     npm install -g verdaccio
+=======
+    npm install -g verdaccio@5.32.2
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   fi
 
   set +e
diff --git a/shell/store/i18n.js b/shell/store/i18n.js
index 8f0bf7722f7..19d122edb54 100644
--- a/shell/store/i18n.js
+++ b/shell/store/i18n.js
@@ -18,7 +18,11 @@ export const state = function() {
   // const available = translationContext.keys().map(path => path.replace(/^.*\/([^\/]+)\.[^.]+$/, '$1'));
   // Using require.context() forces them to all be in the same webpack chunk name... just hardcode the list for now so zh-hans
   // gets generated as it's own chunk instead of being loaded all the time.
+<<<<<<< HEAD
   const available = [DEFAULT_LOCALE, 'zh-hans'];
+=======
+  const available = [DEFAULT_LOCALE];
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
   const out = {
     default:      DEFAULT_LOCALE,
@@ -58,6 +62,13 @@ export const getters = {
     return out;
   },
 
+<<<<<<< HEAD
+=======
+  hasMultipleLocales(state) {
+    return state.available.length > 1;
+  },
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   t: state => (key, args, language) => {
     if (state.selected === NONE && !language) {
       return `%${ key }%`;
@@ -322,7 +333,11 @@ export const actions = {
 
     commit('setSelected', locale);
 
+<<<<<<< HEAD
     // Ony update the preference if the locale changed
+=======
+    // Only update the preference if the locale changed
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     if (currentLocale !== locale) {
       dispatch('prefs/set', {
         key:   'locale',
diff --git a/shell/store/index.js b/shell/store/index.js
index 585fa4d41df..5ce09a3ecd5 100644
--- a/shell/store/index.js
+++ b/shell/store/index.js
@@ -590,7 +590,11 @@ export const mutations = {
     state.isRancherInHarvester = neu;
   },
 
+<<<<<<< HEAD
   updateNamespaces(state, { filters, all }) {
+=======
+  updateNamespaces(state, { filters, all, getters: optGetters }) {
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     state.namespaceFilters = filters.filter(x => !!x);
 
     if ( all ) {
@@ -598,7 +602,11 @@ export const mutations = {
     }
     // Create map that can be used to efficiently check if a
     // resource should be displayed
+<<<<<<< HEAD
     getActiveNamespaces(state, getters);
+=======
+    getActiveNamespaces(state, optGetters || getters);
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   },
 
   changeAllNamespaces(state, namespace) {
@@ -948,6 +956,10 @@ export const actions = {
     commit('updateNamespaces', {
       filters: filters || [ALL_USER],
       all:     allNamespaces,
+<<<<<<< HEAD
+=======
+      getters
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     });
 
     if (getters['currentCluster'] && getters['currentCluster'].isHarvester) {
@@ -970,7 +982,11 @@ export const actions = {
       }
     });
 
+<<<<<<< HEAD
     commit('updateNamespaces', { filters: ids });
+=======
+    commit('updateNamespaces', { filters: ids, getters });
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   },
 
   async cleanNamespaces({ getters, dispatch }) {
diff --git a/shell/store/plugins.js b/shell/store/plugins.js
index 5bd9fc02ac6..0f6f2298f4f 100644
--- a/shell/store/plugins.js
+++ b/shell/store/plugins.js
@@ -164,16 +164,28 @@ export const getters = {
   },
 
   fieldNamesForDriver(state, getters) {
+<<<<<<< HEAD
     return (name) => {
       const schema = getters.schemaForDriver(name);
 
+=======
+    return async(name) => {
+      const schema = getters.schemaForDriver(name);
+
+      await schema.fetchResourceFields();
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       if ( !schema ) {
         // eslint-disable-next-line no-console
         console.error(`Machine Driver Config schema not found for ${ name }`);
 
         return [];
       }
+<<<<<<< HEAD
 
+=======
+      // This is used in places where `createPopulated` has been called, which has called fetchResourceFields to populate resourceFields
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       const out = Object.keys(schema?.resourceFields || {});
 
       removeObjects(out, ['apiVersion', 'dockerPort', 'kind', 'metadata']);
@@ -183,9 +195,17 @@ export const getters = {
   },
 
   fieldsForDriver(state, getters) {
+<<<<<<< HEAD
     return (name) => {
       const schema = getters.schemaForDriver(name);
       const names = getters.fieldNamesForDriver(name);
+=======
+    return async(name) => {
+      const schema = getters.schemaForDriver(name);
+
+      await schema.fetchResourceFields();
+      const names = await getters.fieldNamesForDriver(name);
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
       const out = {};
 
diff --git a/shell/utils/__tests__/create-yaml.test.ts b/shell/utils/__tests__/create-yaml.test.ts
index 8bf4742c94d..f61bb8c9489 100644
--- a/shell/utils/__tests__/create-yaml.test.ts
+++ b/shell/utils/__tests__/create-yaml.test.ts
@@ -1,7 +1,13 @@
 import {
   getBlockDescriptor,
   dumpBlock,
+<<<<<<< HEAD
 } from '@shell/utils/create-yaml';
+=======
+  createYaml,
+} from '@shell/utils/create-yaml';
+import SteveSchema from '@shell/models/steve-schema';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 const key = 'example';
 const randomData = '\n      foo\n      bar\n';
@@ -61,3 +67,351 @@ describe('fx: dumpBlock', () => {
     });
   });
 });
+<<<<<<< HEAD
+=======
+
+describe('fx: resourceFields', () => {
+  const configMap = {
+    type:     'configmap',
+    metadata: {
+      namespace: 'default', annotations: {}, labels: {}
+    },
+    __clone: true
+  };
+
+  const configMapSchema = {
+    id:             'configmap',
+    type:           'schema',
+    resourceFields: null,
+    attributes:     {
+      columns: [
+        {
+          name:        'Name',
+          type:        'string',
+          format:      'name',
+          description: 'Name must be unique within a namespace. Is required when creating resources, although some resources may allow a client to request the generation of an appropriate name automatically. Name is primarily intended for creation idempotence and configuration definition. Cannot be updated. More info: http://kubernetes.io/docs/user-guide/identifiers#names',
+          priority:    0,
+          field:       '$.metadata.fields[0]'
+        },
+        {
+          name:        'Data',
+          type:        'string',
+          format:      '',
+          description: "Data contains the configuration data. Each key must consist of alphanumeric characters, '-', '_' or '.'. Values with non-UTF-8 byte sequences must use the BinaryData field. The keys stored in Data must not overlap with the keys in the BinaryData field, this is enforced during validation process.",
+          priority:    0,
+          field:       '$.metadata.fields[1]'
+        },
+        {
+          name:        'Age',
+          type:        'string',
+          format:      '',
+          description: 'CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata',
+          priority:    0,
+          field:       '$.metadata.fields[2]'
+        }
+      ],
+      group:      '',
+      kind:       'ConfigMap',
+      namespaced: true,
+      resource:   'configmaps',
+      verbs:      [
+        'create',
+        'delete',
+        'deletecollection',
+        'get',
+        'list',
+        'patch',
+        'update',
+        'watch'
+      ],
+      version: 'v1'
+    }
+  };
+
+  const configMapSchemaDefinition = {
+    id:             'configmap',
+    type:           'schemaDefinition',
+    links:          { self: '…/v1/schemaDefinitions/configmap' },
+    definitionType: 'io.k8s.api.core.v1.ConfigMap',
+    definitions:    {
+      'io.k8s.api.core.v1.ConfigMap': {
+        resourceFields: {
+          apiVersion: {
+            type:        'string',
+            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+          },
+          binaryData: {
+            type:        'map',
+            subtype:     'string',
+            description: "BinaryData contains the binary data. Each key must consist of alphanumeric characters, '-', '_' or '.'. BinaryData can contain byte sequences that are not in the UTF-8 range. The keys stored in BinaryData must not overlap with the ones in the Data field, this is enforced during validation process. Using this field will require 1.10+ apiserver and kubelet."
+          },
+          data: {
+            type:        'map',
+            subtype:     'string',
+            description: "Data contains the configuration data. Each key must consist of alphanumeric characters, '-', '_' or '.'. Values with non-UTF-8 byte sequences must use the BinaryData field. The keys stored in Data must not overlap with the keys in the BinaryData field, this is enforced during validation process."
+          },
+          immutable: {
+            type:        'boolean',
+            description: 'Immutable, if set to true, ensures that data stored in the ConfigMap cannot be updated (only object metadata can be modified). If not set to true, the field can be modified at any time. Defaulted to nil.'
+          },
+          kind: {
+            type:        'string',
+            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+          },
+          metadata: {
+            type:        'io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta',
+            description: "Standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata"
+          }
+        },
+        type:        'io.k8s.api.core.v1.ConfigMap',
+        description: 'ConfigMap holds configuration data for pods to consume.'
+      },
+      'io.k8s.apimachinery.pkg.apis.meta.v1.ManagedFieldsEntry': {
+        resourceFields: {
+          apiVersion: {
+            type:        'string',
+            description: 'APIVersion defines the version of this resource that this field set applies to. The format is "group/version" just like the top-level APIVersion field. It is necessary to track the version of a field set because it cannot be automatically converted.'
+          },
+          fieldsType: {
+            type:        'string',
+            description: 'FieldsType is the discriminator for the different fields format and version. There is currently only one possible value: "FieldsV1"'
+          },
+          fieldsV1: {
+            type:        'map',
+            subtype:     'int',
+            description: 'FieldsV1 holds the first JSON version format as described in the "FieldsV1" type.'
+          },
+          manager: {
+            type:        'string',
+            description: 'Manager is an identifier of the workflow managing these fields.'
+          },
+          operation: {
+            type:        'string',
+            description: "Operation is the type of operation which lead to this ManagedFieldsEntry being created. The only valid values for this field are 'Apply' and 'Update'."
+          },
+          subresource: {
+            type:        'string',
+            description: 'Subresource is the name of the subresource used to update that object, or empty string if the object was updated through the main resource. The value of this field is used to distinguish between managers, even if they share the same name. For example, a status update will be distinct from a regular update using the same manager name. Note that the APIVersion field is not related to the Subresource field and it always corresponds to the version of the main resource.'
+          },
+          time: {
+            type:        'string',
+            description: 'Time is the timestamp of when the ManagedFields entry was added. The timestamp will also be updated if a field is added, the manager changes any of the owned fields value or removes a field. The timestamp does not update when a field is removed from the entry because another manager took it over.'
+          }
+        },
+        type:        'io.k8s.apimachinery.pkg.apis.meta.v1.ManagedFieldsEntry',
+        description: 'ManagedFieldsEntry is a workflow-id, a FieldSet and the group version of the resource that the fieldset applies to.'
+      },
+      'io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta': {
+        resourceFields: {
+          annotations: {
+            type:        'map',
+            subtype:     'string',
+            description: 'Annotations is an unstructured key value map stored with a resource that may be set by external tools to store and retrieve arbitrary metadata. They are not queryable and should be preserved when modifying objects. More info: http://kubernetes.io/docs/user-guide/annotations'
+          },
+          creationTimestamp: {
+            type:        'string',
+            description: 'CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata'
+          },
+          deletionGracePeriodSeconds: {
+            type:        'int',
+            description: 'Number of seconds allowed for this object to gracefully terminate before it will be removed from the system. Only set when deletionTimestamp is also set. May only be shortened. Read-only.'
+          },
+          deletionTimestamp: {
+            type:        'string',
+            description: 'DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This field is set by the server when a graceful deletion is requested by the user, and is not directly settable by a client. The resource is expected to be deleted (no longer visible from resource lists, and not reachable by name) after the time in this field, once the finalizers list is empty. As long as the finalizers list contains items, deletion is blocked. Once the deletionTimestamp is set, this value may not be unset or be set further into the future, although it may be shortened or the resource may be deleted prior to this time. For example, a user may request that a pod is deleted in 30 seconds. The Kubelet will react by sending a graceful termination signal to the containers in the pod. After that 30 seconds, the Kubelet will send a hard termination signal (SIGKILL) to the container and after cleanup, remove the pod from the API. In the presence of network partitions, this object may still exist after this timestamp, until an administrator or automated process can determine the resource is fully terminated. If not set, graceful deletion of the object has not been requested.\n\nPopulated by the system when a graceful deletion is requested. Read-only. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata'
+          },
+          finalizers: {
+            type:        'array',
+            subtype:     'string',
+            description: 'Must be empty before the object is deleted from the registry. Each entry is an identifier for the responsible component that will remove the entry from the list. If the deletionTimestamp of the object is non-nil, entries in this list can only be removed. Finalizers may be processed and removed in any order.  Order is NOT enforced because it introduces significant risk of stuck finalizers. finalizers is a shared field, any actor with permission can reorder it. If the finalizer list is processed in order, then this can lead to a situation in which the component responsible for the first finalizer in the list is waiting for a signal (field value, external system, or other) produced by a component responsible for a finalizer later in the list, resulting in a deadlock. Without enforced ordering finalizers are free to order amongst themselves and are not vulnerable to ordering changes in the list.'
+          },
+          generateName: {
+            type:        'string',
+            description: 'GenerateName is an optional prefix, used by the server, to generate a unique name ONLY IF the Name field has not been provided. If this field is used, the name returned to the client will be different than the name passed. This value will also be combined with a unique suffix. The provided value has the same validation rules as the Name field, and may be truncated by the length of the suffix required to make the value unique on the server.\n\nIf this field is specified and the generated name exists, the server will return a 409.\n\nApplied only if Name is not specified. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#idempotency'
+          },
+          generation: {
+            type:        'int',
+            description: 'A sequence number representing a specific generation of the desired state. Populated by the system. Read-only.'
+          },
+          labels: {
+            type:        'map',
+            subtype:     'string',
+            description: 'Map of string keys and values that can be used to organize and categorize (scope and select) objects. May match selectors of replication controllers and services. More info: http://kubernetes.io/docs/user-guide/labels'
+          },
+          managedFields: {
+            type:        'array',
+            subtype:     'io.k8s.apimachinery.pkg.apis.meta.v1.ManagedFieldsEntry',
+            description: "ManagedFields maps workflow-id and version to the set of fields that are managed by that workflow. This is mostly for internal housekeeping, and users typically shouldn't need to set or understand this field. A workflow can be the user's name, a controller's name, or the name of a specific apply path like \"ci-cd\". The set of fields is always in the version that the workflow used when modifying the object."
+          },
+          name: {
+            type:        'string',
+            description: 'Name must be unique within a namespace. Is required when creating resources, although some resources may allow a client to request the generation of an appropriate name automatically. Name is primarily intended for creation idempotence and configuration definition. Cannot be updated. More info: http://kubernetes.io/docs/user-guide/identifiers#names'
+          },
+          namespace: {
+            type:        'string',
+            description: 'Namespace defines the space within which each name must be unique. An empty namespace is equivalent to the "default" namespace, but "default" is the canonical representation. Not all objects are required to be scoped to a namespace - the value of this field for those objects will be empty.\n\nMust be a DNS_LABEL. Cannot be updated. More info: http://kubernetes.io/docs/user-guide/namespaces'
+          },
+          ownerReferences: {
+            type:        'array',
+            subtype:     'io.k8s.apimachinery.pkg.apis.meta.v1.OwnerReference',
+            description: 'List of objects depended by this object. If ALL objects in the list have been deleted, this object will be garbage collected. If this object is managed by a controller, then an entry in this list will point to this controller, with the controller field set to true. There cannot be more than one managing controller.'
+          },
+          resourceVersion: {
+            type:        'string',
+            description: 'An opaque value that represents the internal version of this object that can be used by clients to determine when objects have changed. May be used for optimistic concurrency, change detection, and the watch operation on a resource or set of resources. Clients must treat these values as opaque and passed unmodified back to the server. They may only be valid for a particular resource or set of resources.\n\nPopulated by the system. Read-only. Value must be treated as opaque by clients and . More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
+          },
+          selfLink: {
+            type:        'string',
+            description: 'Deprecated: selfLink is a legacy read-only field that is no longer populated by the system.'
+          },
+          uid: {
+            type:        'string',
+            description: 'UID is the unique in time and space value for this object. It is typically generated by the server on successful creation of a resource and is not allowed to change on PUT operations.\n\nPopulated by the system. Read-only. More info: http://kubernetes.io/docs/user-guide/identifiers#uids'
+          }
+        },
+        type:        'io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta',
+        description: 'ObjectMeta is metadata that all persisted resources must have, which includes all objects users must create.'
+      },
+      'io.k8s.apimachinery.pkg.apis.meta.v1.OwnerReference': {
+        resourceFields: {
+          apiVersion: {
+            type:        'string',
+            description: 'API version of the referent.',
+            required:    true
+          },
+          blockOwnerDeletion: {
+            type:        'boolean',
+            description: 'If true, AND if the owner has the "foregroundDeletion" finalizer, then the owner cannot be deleted from the key-value store until this reference is removed. See https://kubernetes.io/docs/concepts/architecture/garbage-collection/#foreground-deletion for how the garbage collector interacts with this field and enforces the foreground deletion. Defaults to false. To set this field, a user needs "delete" permission of the owner, otherwise 422 (Unprocessable Entity) will be returned.'
+          },
+          controller: {
+            type:        'boolean',
+            description: 'If true, this reference points to the managing controller.'
+          },
+          kind: {
+            type:        'string',
+            description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds',
+            required:    true
+          },
+          name: {
+            type:        'string',
+            description: 'Name of the referent. More info: http://kubernetes.io/docs/user-guide/identifiers#names',
+            required:    true
+          },
+          uid: {
+            type:        'string',
+            description: 'UID of the referent. More info: http://kubernetes.io/docs/user-guide/identifiers#uids',
+            required:    true
+          }
+        },
+        type:        'io.k8s.apimachinery.pkg.apis.meta.v1.OwnerReference',
+        description: 'OwnerReference contains enough information to let you identify an owning object. An owning object must be in the same namespace as the dependent, or be cluster-scoped, so there is no namespace field.'
+      }
+    }
+  };
+
+  afterEach(() => { // eslint-disable-line jest/no-hooks
+    SteveSchema.reset();
+  });
+
+  it('schema has empty resource fields', () => {
+    const configMapSteveSchema = new SteveSchema(configMapSchema, {});
+
+    configMapSteveSchema['cacheSchemaDefinitionResponse']({
+      ...configMapSchemaDefinition,
+      definitions: {
+        'io.k8s.api.core.v1.ConfigMap': {
+          ...configMapSchemaDefinition.definitions['io.k8s.api.core.v1.ConfigMap'],
+          resourceFields: {}
+        }
+      }
+    });
+
+    // The data passed in and some 'ALWAYS_ADD' fields make it in
+    const expected =
+      `metadata:
+  namespace: default
+  annotations: {}
+  labels: {}
+__clone: true
+apiVersion: v1
+kind: ConfigMap`;
+
+    const actual = createYaml(
+      [configMapSteveSchema],
+      configMapSchema.id,
+      configMap
+    );
+
+    expect(actual).toStrictEqual(expected);
+  });
+
+  it('schema has one resource field', () => {
+    const configMapSteveSchema = new SteveSchema(configMapSchema, {});
+
+    configMapSteveSchema['cacheSchemaDefinitionResponse']({
+      ...configMapSchemaDefinition,
+      definitions: {
+        'io.k8s.api.core.v1.ConfigMap': {
+          ...configMapSchemaDefinition.definitions['io.k8s.api.core.v1.ConfigMap'],
+          resourceFields: {
+            immutable: {
+              type:        'boolean',
+              description: 'Immutable, if set to true, ensures that data stored in the ConfigMap cannot be updated (only object metadata can be modified). If not set to true, the field can be modified at any time. Defaulted to nil.'
+            },
+          }
+        }
+      }
+    });
+
+    // The data passed in and some defaults from the schema make it in
+    const expected =
+      `metadata:
+  namespace: default
+  annotations: {}
+  labels: {}
+__clone: true
+apiVersion: v1
+kind: ConfigMap
+#immutable: boolean`;
+
+    const actual = createYaml(
+      [configMapSteveSchema],
+      configMapSchema.id,
+      configMap
+    );
+
+    expect(actual).toStrictEqual(expected);
+  });
+
+  it('schema has nested resource fields', () => {
+    const configMapSteveSchema = new SteveSchema(configMapSchema, {});
+
+    configMapSteveSchema['cacheSchemaDefinitionResponse'](configMapSchemaDefinition);
+
+    const expected =
+      `apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: #string
+  annotations:
+    {}
+    #  key: string
+  labels:
+    {}
+    #  key: string
+  namespace: default
+__clone: true
+#binaryData:  key: string
+#data:  key: string
+#immutable: boolean`;
+
+    const actual = createYaml(
+      [configMapSteveSchema],
+      configMapSchema.id,
+      configMap
+    );
+
+    expect(actual).toStrictEqual(expected);
+  });
+});
+>>>>>>> b5455bcb (fix: separate used/allocated units)
diff --git a/shell/utils/alertmanagerconfig.js b/shell/utils/alertmanagerconfig.js
index e003b907ba0..f2fed926e44 100644
--- a/shell/utils/alertmanagerconfig.js
+++ b/shell/utils/alertmanagerconfig.js
@@ -5,6 +5,28 @@ import { get, set } from '@shell/utils/object';
 import isEmpty from 'lodash/isEmpty';
 import { ROOT_NAME } from '@shell/models/monitoring.coreos.com.route';
 
+<<<<<<< HEAD
+=======
+/**
+ * Find secondary schema's related to the primary `monitoring.coreos.com.alertmanagerconfig` schema
+ */
+export const fetchAlertManagerConfigSpecs = async($store) => {
+  const schema = $store.getters['cluster/schemaFor'](MONITORING.ALERTMANAGERCONFIG);
+
+  if (!schema) {
+    return;
+  }
+
+  // Make the http request to fetch schema definitions for alertmanagerconfig
+  await schema.fetchResourceFields();
+
+  return {
+    receiverSchema: schema.schemaDefinitions?.[`${ schema.schemaDefinition.id }.spec.receivers`],
+    routeSchema:    schema.schemaDefinitions?.[`${ schema.schemaDefinition.id }.spec.route`],
+  };
+};
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 const DEFAULT_SECRET_ID = 'cattle-monitoring-system/alertmanager-rancher-monitoring-alertmanager';
 const ALERTMANAGER_ID = 'cattle-monitoring-system/rancher-monitoring-alertmanager';
 
diff --git a/shell/utils/async.ts b/shell/utils/async.ts
index e83db4c0ecb..280ccaad4f0 100644
--- a/shell/utils/async.ts
+++ b/shell/utils/async.ts
@@ -34,3 +34,8 @@ export const waitFor = (testFn: Function, msg = '', timeoutMs = 3000000, interva
     }
   }
 };
+<<<<<<< HEAD
+=======
+
+export const wait = (milliseconds: number): Promise<unknown> => new Promise(resolve => setTimeout(resolve, milliseconds));
+>>>>>>> b5455bcb (fix: separate used/allocated units)
diff --git a/shell/utils/create-yaml.js b/shell/utils/create-yaml.js
index 6548a7588cf..527ae193620 100644
--- a/shell/utils/create-yaml.js
+++ b/shell/utils/create-yaml.js
@@ -2,6 +2,10 @@ import { indent as _indent } from '@shell/utils/string';
 import { addObject, findBy, removeObject, removeObjects } from '@shell/utils/array';
 import jsyaml from 'js-yaml';
 import { cleanUp, isEmpty } from '@shell/utils/object';
+<<<<<<< HEAD
+=======
+import { parseType } from '@shell/models/schema';
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 export const SIMPLE_TYPES = [
   'string',
@@ -83,6 +87,7 @@ export function createYaml(
   depth = 0,
   path = '',
   rootType = null,
+<<<<<<< HEAD
   dataOptions = {}
 ) {
   const schema = findBy(schemas, 'id', type);
@@ -98,11 +103,52 @@ export function createYaml(
   data = data || {};
 
   if ( depth === 0 ) {
+=======
+  dataOptions = {},
+) {
+  data = data || {};
+
+  let schema, rootSchema, schemaDefinitions, schemaResourceFields;
+
+  if (depth === 0) {
+    // `type` is a schema id
+    schema = findBy(schemas, 'id', type);
+
+    if ( !schema ) { // schema is only needed at the root level.
+      return `Error loading schema for ${ type }`;
+    }
+
+    rootSchema = schema;
+
+    schemaDefinitions = rootSchema.schemaDefinitions;
+    schemaResourceFields = rootSchema.resourceFields;
+
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     const attr = schema.attributes || {};
 
     // Default to data.apiVersion/kind to accommodate spoofed types that aggregate multiple types
     data.apiVersion = (attr.group ? `${ attr.group }/${ attr.version }` : attr.version) || data.apiVersion;
     data.kind = attr.kind || data.kind;
+<<<<<<< HEAD
+=======
+  } else {
+    rootSchema = findBy(schemas, 'id', rootType);
+
+    if (rootSchema.requiresResourceFields) { // See `requiresResourceFields` definition
+      schemaDefinitions = rootSchema.schemaDefinitions;
+      schemaResourceFields = schemaDefinitions[type]?.resourceFields;
+    } else {
+      schema = findBy(schemas, 'id', type);
+      if ( !schema ) { // schema is only needed at the root level.
+        return `Error loading schema for ${ type }`;
+      }
+      schemaResourceFields = schema.resourceFields;
+    }
+  }
+
+  if ( !rootType ) {
+    rootType = type;
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   }
 
   const regularFields = [];
@@ -127,14 +173,22 @@ export function createYaml(
       const key = parts[parts.length - 1];
       const prefix = parts.slice(0, -1).join('.');
 
+<<<<<<< HEAD
       if ( prefix === path && schema.resourceFields && schema.resourceFields[key] ) {
+=======
+      if ( prefix === path && schemaResourceFields && schemaResourceFields[key] ) {
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         addObject(regularFields, key);
       }
     }
   }
 
   // Include all fields in schema's resourceFields as comments
+<<<<<<< HEAD
   const commentFields = Object.keys(schema.resourceFields || {});
+=======
+  const commentFields = Object.keys(schemaResourceFields || {});
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
   commentFields.forEach((key) => {
     if ( typeof data[key] !== 'undefined' || (depth === 0 && key === '_type') ) {
@@ -166,7 +220,11 @@ export function createYaml(
     const key = parts[parts.length - 1];
     const prefix = parts.slice(0, -1).join('.');
 
+<<<<<<< HEAD
     if ( prefix === path && schema.resourceFields && schema.resourceFields[key] ) {
+=======
+    if ( prefix === path && schemaResourceFields && schemaResourceFields[key] ) {
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       removeObject(commentFields, key);
     }
   }
@@ -178,8 +236,11 @@ export function createYaml(
   const comments = commentFields.map((k) => {
     // Don't add a namespace comment for types that aren't namespaced.
     if ( path === 'metadata' && k === 'namespace' ) {
+<<<<<<< HEAD
       const rootSchema = findBy(schemas, 'id', rootType);
 
+=======
+>>>>>>> b5455bcb (fix: separate used/allocated units)
       if ( rootSchema && !rootSchema.attributes?.namespaced ) {
         return null;
       }
@@ -198,7 +259,11 @@ export function createYaml(
   // ---------------
 
   function stringifyField(key) {
+<<<<<<< HEAD
     const field = schema.resourceFields?.[key];
+=======
+    const field = schemaResourceFields?.[key];
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     let out = `${ key }:`;
 
     // '_type' in steve maps to kubernetes 'type' field; show 'type' field in yaml
@@ -229,8 +294,13 @@ export function createYaml(
     }
 
     const type = typeMunge(field.type);
+<<<<<<< HEAD
     const mapOf = typeRef('map', type);
     const arrayOf = typeRef('array', type);
+=======
+    const mapOf = typeRef('map', type, field);
+    const arrayOf = typeRef('array', type, field);
+>>>>>>> b5455bcb (fix: separate used/allocated units)
     const referenceTo = typeRef('reference', type);
 
     // type == map[mapOf]
@@ -250,7 +320,11 @@ export function createYaml(
       if ( SIMPLE_TYPES.includes(mapOf) ) {
         out += `#  key: ${ mapOf }`;
       } else {
+<<<<<<< HEAD
         // If not a simple type ie some sort of object/array, recusively build out commented fields (note data = null here) per the type's (mapOf's) schema
+=======
+        // If not a simple type ie some sort of object/array, recursively build out commented fields (note data = null here) per the type's (mapOf's) schema
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         const chunk = createYaml(schemas, mapOf, null, processAlwaysAdd, depth + 1, (path ? `${ path }.${ key }` : key), rootType, dataOptions);
         let indented = indent(chunk);
 
@@ -275,7 +349,11 @@ export function createYaml(
             out += `\n${ indent(parsedData.trim()) }`;
           }
         } catch (e) {
+<<<<<<< HEAD
           console.error(`Error: Unale to parse array data for yaml of type: ${ type }`, e); // eslint-disable-line no-console
+=======
+          console.error(`Error: Unable to parse array data for yaml of type: ${ type }`, e); // eslint-disable-line no-console
+>>>>>>> b5455bcb (fix: separate used/allocated units)
         }
       }
 
@@ -331,7 +409,11 @@ export function createYaml(
       }
     }
 
+<<<<<<< HEAD
     const subDef = findBy(schemas, 'id', type);
+=======
+    const subDef = schemaDefinitions?.[type] || findBy(schemas, 'id', type);
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
     if ( subDef) {
       let chunk;
@@ -407,12 +489,28 @@ function getBlockIndentation(blockHeader) {
   return indentation?.[0] || '';
 }
 
+<<<<<<< HEAD
 export function typeRef(type, str) {
   const re = new RegExp(`^${ type }\\[(.*)\\]$`);
   const match = str.match(re);
 
   if ( match ) {
     return typeMunge(match[1]);
+=======
+/**
+ * Check for a specific type and if valid return it's sub type or self
+ * @param {string} type required type
+ * @param {string} str actual type
+ * @param {ResourceField} field resourceField entry to the actual type
+ *
+ * @returns the sub type, or if not found the type
+ */
+export function typeRef(type, str, field = null) {
+  const [foundType, foundSubType] = parseType(str, field);
+
+  if (type === foundType) {
+    return typeMunge(foundSubType || foundType);
+>>>>>>> b5455bcb (fix: separate used/allocated units)
   }
 }
 
diff --git a/shell/utils/router.js b/shell/utils/router.js
index c5d77681efa..a18ec8f6e16 100644
--- a/shell/utils/router.js
+++ b/shell/utils/router.js
@@ -25,3 +25,69 @@ export function queryParamsFor(current, qp, defaults = {}) {
 
   return query;
 }
+<<<<<<< HEAD
+=======
+
+export function getClusterFromRoute(to) {
+  let cluster = to.params?.cluster;
+
+  if (!cluster) {
+    cluster = findMeta(to, 'cluster');
+  }
+
+  return cluster;
+}
+
+export function getProductFromRoute(to) {
+  let product = to.params?.product;
+
+  if ( !product ) {
+    const match = to.name?.match(/^c-cluster-([^-]+)/);
+
+    if ( match ) {
+      product = match[1];
+    }
+  }
+
+  // If still no product, see if the route indicates the product via route metadata
+  if (!product) {
+    product = findMeta(to, 'product');
+  }
+
+  return product;
+}
+
+export const getPackageFromRoute = (route) => {
+  if (!route?.meta) {
+    return;
+  }
+  // Sometimes meta is an array... sometimes not
+  const arraySafe = Array.isArray(route.meta) ? route.meta : [route.meta];
+
+  return arraySafe.find(m => !!m.pkg)?.pkg;
+};
+
+export const getResourceFromRoute = (to) => {
+  let resource = to.params?.resource;
+
+  if (!resource) {
+    resource = findMeta(to, 'resource');
+  }
+
+  return resource;
+};
+
+function findMeta(route, key) {
+  if (route?.meta) {
+    const meta = Array.isArray(route.meta) ? route.meta : [route.meta];
+
+    for (let i = 0; i < meta.length; i++) {
+      if (meta[i][key]) {
+        return meta[i][key];
+      }
+    }
+  }
+
+  return undefined;
+}
+>>>>>>> b5455bcb (fix: separate used/allocated units)
diff --git a/yarn.lock b/yarn.lock
index acbe3f741f7..cf975634bc8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5481,6 +5481,7 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
+<<<<<<< HEAD
 cron-validator@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/cron-validator/-/cron-validator-1.2.0.tgz#952d2c926b85724dfe9c0d0ca781fe956124de93"
@@ -5490,6 +5491,17 @@ cronstrue@1.95.0:
   version "1.95.0"
   resolved "https://registry.yarnpkg.com/cronstrue/-/cronstrue-1.95.0.tgz#171df1fad8b0f0cb636354dd1d7842161c15478f"
   integrity sha512-CdbQ17Z8Na2IdrK1SiD3zmXfE66KerQZ8/iApkGsxjmUVGJPS9M9oK4FZC3LM6ohUjjq3UeaSk+90Cf3QbXDfw==
+=======
+cron-validator@1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/cron-validator/-/cron-validator-1.3.1.tgz#8f2fe430f92140df77f91178ae31fc1e3a48a20e"
+  integrity sha512-C1HsxuPCY/5opR55G5/WNzyEGDWFVG+6GLrA+fW/sCTcP6A6NTjUP2AK7B8n2PyFs90kDG2qzwm8LMheADku6A==
+
+cronstrue@2.50.0:
+  version "2.50.0"
+  resolved "https://registry.yarnpkg.com/cronstrue/-/cronstrue-2.50.0.tgz#eabba0f915f186765258b707b7a3950c663b5573"
+  integrity sha512-ULYhWIonJzlScCCQrPUG5uMXzXxSixty4djud9SS37DoNxDdkeRocxzHuAo4ImRBUK+mAuU5X9TSwEDccnnuPg==
+>>>>>>> b5455bcb (fix: separate used/allocated units)
 
 cross-env@6.0.3:
   version "6.0.3"