resolving conflicts

package.json

@@ -26,10 +26,10 @@
   },
   "dependencies": {
     "@medusajs/admin": "^7.0.0",
-    "@medusajs/cache-inmemory": "^1.8.7",
-    "@medusajs/cache-redis": "^1.8.7",
-    "@medusajs/event-bus-local": "^1.9.4",
-    "@medusajs/event-bus-redis": "^1.8.7",
+    "@medusajs/cache-inmemory": "^1.8.8",
+    "@medusajs/cache-redis": "^1.8.8",
+    "@medusajs/event-bus-local": "^1.9.6",
+    "@medusajs/event-bus-redis": "^1.8.9",
     "@medusajs/file-local": "^1.0.1",
     "@medusajs/medusa": "^1.14.0",
     "@tanstack/react-query": "4.22.0",
@@ -38,10 +38,10 @@
     "cors": "^2.8.5",
     "dotenv": "16.0.3",
     "express": "^4.17.2",
-    "medusa-fulfillment-manual": "^1.1.37",
+    "medusa-fulfillment-manual": "^1.1.38",
     "medusa-interfaces": "^1.3.7",
-    "medusa-payment-manual": "^1.0.23",
-    "medusa-payment-stripe": "^6.0.1",
+    "medusa-payment-manual": "^1.0.24",
+    "medusa-payment-stripe": "^6.0.3",
     "prism-react-renderer": "^2.0.4",
     "typeorm": "^0.3.16"
   },

yarn.lock

@@ -2071,14 +2071,14 @@
     rollup-plugin-esbuild "5.0.0"
     ts-dedent "^2.2.0"
 
-"@medusajs/cache-inmemory@^1.8.7":
+"@medusajs/cache-inmemory@^1.8.8":
   version "1.8.8"
   resolved "https://registry.yarnpkg.com/@medusajs/cache-inmemory/-/cache-inmemory-1.8.8.tgz#da37f21b92fd1cc7e322e1ff222db0143dee1d98"
   integrity sha512-UutjrOFjPzCiiHZtlfoHSBZ1e8w/F9hBvzMkjHr+0oO+7idvISeptuYeQB+dv8zt9KgZdfMWtgJZPd+MyFZz6w==
   dependencies:
     "@medusajs/modules-sdk" "^1.8.8"
 
-"@medusajs/cache-redis@^1.8.7":
+"@medusajs/cache-redis@^1.8.8":
   version "1.8.8"
   resolved "https://registry.yarnpkg.com/@medusajs/cache-redis/-/cache-redis-1.8.8.tgz#2535828a5b3cfbe65d319265d0f084d4f935cb2a"
   integrity sha512-KjcAYYkjDLM82fAxtdckWBtlS4XGcqNiWhYH2OIQLZyqQp66K5DxsvtfzntO8W3ttBnGCvad1ydSwyAXxMfQRw==
@@ -2087,7 +2087,7 @@
     awilix "^8.0.0"
     ioredis "^5.3.1"
 
-"@medusajs/event-bus-local@^1.9.4":
+"@medusajs/event-bus-local@^1.9.6":
   version "1.9.6"
   resolved "https://registry.yarnpkg.com/@medusajs/event-bus-local/-/event-bus-local-1.9.6.tgz#138f2a57fa81a1d612b3ba121dc974ffecf35655"
   integrity sha512-eah/8duL34kg1MNR2dA9DdcpkJaulJaAbjmh9S7K9GR12AHrl04Wlf9cY6tUi+7nSgTf/r8n9pLNGxMaQ52xlg==
@@ -2096,7 +2096,7 @@
     "@medusajs/utils" "^1.9.2"
     ulid "^2.3.0"
 
-"@medusajs/event-bus-redis@^1.8.7":
+"@medusajs/event-bus-redis@^1.8.9":
   version "1.8.9"
   resolved "https://registry.yarnpkg.com/@medusajs/event-bus-redis/-/event-bus-redis-1.8.9.tgz#0f19d158148ea6622a5a3ce96dff854d4e59e48c"
   integrity sha512-6SHReOjIMrfzV4n/oUS2UOo4GRlxvq/8P5gnJZQLp7dewVaran968bzxLtU1hn9gM5rHjolRpOZQtxdiiListQ==
@@ -9054,7 +9054,7 @@ medusa-core-utils@1.2.0, medusa-core-utils@^1.2.0:
   resolved "https://registry.yarnpkg.com/medusa-core-utils/-/medusa-core-utils-1.2.0.tgz#4a2aa9fd63dacda487b220c8e462540990605092"
   integrity sha512-9mzXGkMsll92C46Ub8A9vwjcfFiHfdkgshwmPP9QpRrm02M6N+SQb45S2A9t0dKjyT9J7rgCCSrFhYQg3pvqbw==
 
-medusa-fulfillment-manual@^1.1.37:
+medusa-fulfillment-manual@^1.1.38:
   version "1.1.38"
   resolved "https://registry.yarnpkg.com/medusa-fulfillment-manual/-/medusa-fulfillment-manual-1.1.38.tgz#3038aa897504837a8e42717970e05b64a6289771"
   integrity sha512-k72UWAK0wklFPMZBVFB4gRJEf/N7aLwOwDVzCYOIUvB3PeGnUGhtDz5hEJjfwsr63KsqqhMiAv9hzD+lKJ4s4g==
@@ -9070,15 +9070,15 @@ medusa-interfaces@^1.3.7:
   resolved "https://registry.yarnpkg.com/medusa-interfaces/-/medusa-interfaces-1.3.7.tgz#57f561f03380100f76e506474abae66714162773"
   integrity sha512-vU1PjepGeglUmEqoBY72gx5Pfj5Uv3VCO3oqYpj6hSz55jhy4xnUNhf4Ttw1mhqGmwtyi9UkHx+aTuCcYx24Ww==
 
-medusa-payment-manual@^1.0.23:
+medusa-payment-manual@^1.0.24:
   version "1.0.24"
   resolved "https://registry.yarnpkg.com/medusa-payment-manual/-/medusa-payment-manual-1.0.24.tgz#4836998d51e4b2be4d0ba7acf3016b35c0f85437"
   integrity sha512-VcQJuuE86J+ePPmZPVp0961Gkjfvu9v/xII9jM5uOH2CsuMsLI3G8QOjDBxn+kiy+hiQFXD1ZoWDDuuFY/Wt8A==
 
-medusa-payment-stripe@^6.0.1:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/medusa-payment-stripe/-/medusa-payment-stripe-6.0.2.tgz#f532467269c53e09d2297d7ae0290bc5c7823742"
-  integrity sha512-B0C08grYmAP/dL4gshLzbJkHBLISGwkmWqr3Oh3dp7OFj38BjG2N5zBl5YwoSJs28+fAjzJ8C23rgYwnnQefzg==
+medusa-payment-stripe@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/medusa-payment-stripe/-/medusa-payment-stripe-6.0.3.tgz#73f6ddc35c09552dd36dd5ea7bedad074a4f396c"
+  integrity sha512-xTLTVXVPD2pr+w1b/DpaEzGMmx/31xNJ/nT4vmcFdvz/XcmYkeou3I6xbRQ17B6EZq5kUO3hntKrQnGQk8rjCA==
   dependencies:
     body-parser "^1.19.0"
     express "^4.17.1"