fix: Merge conflicts with master

packages/inventory/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @medusajs/inventory
 
+## 1.0.7
+
+### Patch Changes
+
+- Updated dependencies [[`b458615ed`](https://github.com/medusajs/medusa/commit/b458615ed50a7c637e9e77f29f21c7ab300ed5d8), [`4b114cc41`](https://github.com/medusajs/medusa/commit/4b114cc4191ba20832b66072ec82386b22a3533c)]:
+  - @medusajs/medusa@1.7.10
+
 ## 1.0.6
 
 ### Patch Changes

packages/inventory/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medusajs/inventory",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "Inventory Module for Medusa",
   "main": "dist/index.js",
   "repository": {
@@ -35,7 +35,7 @@
     "test:unit": "jest --passWithNoTests"
   },
   "peerDependencies": {
-    "@medusajs/medusa": "1.7.9",
+    "@medusajs/medusa": "1.7.10",
     "typeorm": "^0.3.11"
   }
 }