chore: Merge conflicts with master

packages/medusa/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medusajs/medusa",
-  "version": "1.7.12",
+  "version": "1.7.13",
   "description": "E-commerce for JAMstack",
   "main": "dist/index.js",
   "bin": "./cli.js",
@@ -74,7 +74,7 @@
     "jsonwebtoken": "^8.5.1",
     "medusa-core-utils": "^1.1.39",
     "medusa-telemetry": "^0.0.16",
-    "medusa-test-utils": "^1.1.38",
+    "medusa-test-utils": "^1.1.39",
     "morgan": "^1.9.1",
     "multer": "^1.4.4",
     "node-schedule": "^2.1.1",