fix: Merge conflicts with master

.changeset/good-crews-pull.md

@@ -1,5 +0,0 @@
----
-"@medusajs/medusa": patch
----
-
-Fix(medusa): All payment sessions should be removed if cart total reach 0

.changeset/pink-emus-drum.md

@@ -1,5 +0,0 @@
----
-"@medusajs/medusa": patch
----
-
-feat(medusa): Use Bull `jobId` option to identify duplicates

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"
   }
 }

packages/medusa/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 1.7.10
+
+### Patch Changes
+
+- [#3346](https://github.com/medusajs/medusa/pull/3346) [`b458615ed`](https://github.com/medusajs/medusa/commit/b458615ed50a7c637e9e77f29f21c7ab300ed5d8) Thanks [@adrien2p](https://github.com/adrien2p)! - Fix(medusa): All payment sessions should be removed if cart total reach 0
+
+- [#3351](https://github.com/medusajs/medusa/pull/3351) [`4b114cc41`](https://github.com/medusajs/medusa/commit/4b114cc4191ba20832b66072ec82386b22a3533c) Thanks [@olivermrbl](https://github.com/olivermrbl)! - feat(medusa): Use Bull `jobId` option to identify duplicates
+
 ## 1.7.9
 
 ### Patch Changes

packages/medusa/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medusajs/medusa",
-  "version": "1.7.9",
+  "version": "1.7.10",
   "description": "E-commerce for JAMstack",
   "main": "dist/index.js",
   "bin": "./cli.js",

yarn.lock

@@ -5226,7 +5226,7 @@ __metadata:
     typeorm: ^0.3.11
     typescript: ^4.4.4
   peerDependencies:
-    "@medusajs/medusa": 1.7.9
+    "@medusajs/medusa": 1.7.10
     typeorm: ^0.3.11
   languageName: unknown
   linkType: soft