chore: Fix merge conflicts with master

packages/inventory/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @medusajs/inventory
 
+## 1.0.8
+
+### Patch Changes
+
+- Updated dependencies [[`c43248131`](https://github.com/medusajs/medusa/commit/c432481319cc205938081c3fcf60e75053b659ca)]:
+  - @medusajs/medusa@1.7.11
+
 ## 1.0.7
 
 ### Patch Changes

packages/inventory/package.json

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