Resolve merge conflicts

package.json

@@ -24,12 +24,17 @@
     "body-parser": "^1.18.3",
     "dotenv": "^6.0.0",
     "express-fileupload": "^1.1.1-alpha.1",
+    "express-graphql": "^0.7.1",
     "express-validation": "^1.0.2",
+    "file-loader": "^1.1.11",
+    "graphql": "^14.2.1",
+    "graphql-tools": "^4.0.4",
     "http-status": "^1.2.0",
     "ignore-styles": "^5.0.1",
     "image-size": "^0.7.1",
     "joi": "^13.6.0",
     "jsonwebtoken": "^8.4.0",
+    "merge-graphql-schemas": "^1.5.8",
     "method-override": "^3.0.0",
     "mkdirp": "^0.5.1",
     "passport": "^0.4.0",
@@ -53,9 +58,11 @@
   "devDependencies": {
     "@babel/core": "^7.2.0",
     "@babel/plugin-proposal-class-properties": "^7.2.1",
+    "@babel/plugin-transform-runtime": "^7.4.3",
     "@babel/preset-env": "^7.2.0",
     "@babel/preset-react": "^7.0.0",
     "@babel/register": "^7.0.0",
+    "@babel/runtime": "^7.4.3",
     "autoprefixer": "^9.0.1",
     "axios": "^0.18.0",
     "babel-core": "^7.0.0-bridge.0",