conflicts

components/HeaderBlock.vue

@@ -32,7 +32,7 @@
           </ClientOnly>
           <div class="w-full flex items-center justify-between">
             <div class="flex items-center gap-[30px]">
-                  <div>
+              <div>
                 <i v-if="!userStore.isLogged"
                   @click="menuStore.navigateToItem(menuStore.menuItems?.find((item) => item.id === 11))"
                   class="uil uil-user text-[31px] cursor-pointer"></i>
@@ -374,13 +374,14 @@ import CartPopup from './CartPopup.vue'
 import CountryCurrencySelector from './CountryCurrencySelector.vue'
 import LangSwitcher from './LangSwitcher.vue'
 
-const menuStore = useMenuStore()
 const userStore = useUserStore()
 const productStore = useProductStore()
 const open = ref(false)
 const colorMode = useColorMode()
+const menuStore = useMenuStore();
+const checkoutStore = useCheckoutStore();
 
-productStore.getCart()
+checkoutStore.getUserCart()
 
 const route = useRoute()
 const isDark = computed({