fix merge conflicts

packages/medusa-plugin-restock-notification/package.json

@@ -1,6 +1,6 @@
 {
   "name": "medusa-plugin-restock-notification",
-  "version": "0.0.4",
+  "version": "0.0.6-next.13+df18c05",
   "main": "index.js",
   "repository": {
     "type": "git",
@@ -14,7 +14,6 @@
     "@babel/core": "^7.7.5",
     "@babel/plugin-transform-typescript": "^7.13.0",
     "@babel/preset-typescript": "^7.12.7",
-    "@medusajs/medusa": "^1.1.20",
     "babel-preset-medusa-package": "^1.1.4",
     "cross-env": "^5.2.1",
     "eslint": "^6.8.0",
@@ -39,5 +38,5 @@
     "express": "^4.17.1",
     "medusa-core-utils": "^1.1.10"
   },
-  "gitHead": "43a3e5680387cdeddb0d92a1bb0762235f15ca9a"
+  "gitHead": "df18c053cb9ec801dd3cb54b0a60a4b9ce8e23c4"
 }

packages/medusa/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medusajs/medusa",
-  "version": "1.1.20",
+  "version": "1.1.22-next.12+245ccdc",
   "description": "E-commerce for JAMstack",
   "main": "dist/index.js",
   "repository": {
@@ -78,5 +78,5 @@
     "uuid": "^8.3.1",
     "winston": "^3.2.1"
   },
-  "gitHead": "982da259ed93fe1b618800c8693a5c9dfe312532"
+  "gitHead": "245ccdc4774965cdd27d4dbdb5fbb084c8066c66"
 }