fix merge conflicts

packages/medusa/package.json

@@ -15,17 +15,8 @@
   "license": "MIT",
   "devDependencies": {
     "@babel/cli": "^7.14.3",
-    "@babel/core": "^7.7.5",
-    "@babel/node": "^7.7.4",
-    "@babel/plugin-proposal-class-properties": "^7.7.4",
-    "@babel/plugin-proposal-decorators": "^7.12.1",
-    "@babel/plugin-transform-classes": "^7.9.5",
-    "@babel/plugin-transform-instanceof": "^7.8.3",
-    "@babel/plugin-transform-runtime": "^7.7.6",
-    "@babel/preset-env": "^7.7.5",
-    "@babel/preset-typescript": "^7.12.7",
-    "@babel/register": "^7.7.4",
-    "@babel/runtime": "^7.7.6",
+    "@babel/core": "^7.14.3",
+    "@babel/preset-typescript": "^7.13.0",
     "babel-preset-medusa-package": "^1.1.3",
     "cross-env": "^5.2.1",
     "eslint": "^6.8.0",
@@ -87,4 +78,4 @@
     "winston": "^3.2.1"
   },
   "gitHead": "982da259ed93fe1b618800c8693a5c9dfe312532"
-}
+}