fixing some conflicts

Author: gagoar

package.json

@@ -17,20 +17,6 @@
   "engines": {
     "node": ">=6.0.0"
   },
-<<<<<<< HEAD
-  "eslintConfig": {
-    "extends": [
-      "plugin:@typescript-eslint/recommended",
-      "prettier",
-      "prettier/@typescript-eslint"
-    ],
-    "parser": "@typescript-eslint/parser",
-    "parserOptions": {
-      "project": "./tsconfig.eslint.json"
-    }
-  },
-=======
->>>>>>> c1ad3d9f0abdc1c196b98e10587b844e4a6ec518
   "browserify": {
     "transform": [
       "babelify"
@@ -43,21 +29,18 @@
     "postinstall": "npm run download && npm run build",
     "start": "node lib/server",
     "watch": "babel scripts/watch.js | node",
-<<<<<<< HEAD
-    "test": "npm run lint && npm run test:only",
-=======
     "test": "npm run lint && npm run check && npm run test:only",
->>>>>>> c1ad3d9f0abdc1c196b98e10587b844e4a6ec518
     "test:only": "jest",
     "lint": "eslint src handler",
     "lint:fix": "eslint --fix src handler",
+    "check": "flow check",
     "cover": "babel-node node_modules/.bin/isparta cover --root src --report html node_modules/.bin/_mocha -- $npm_package_options_mocha",
     "coveralls": "babel-node node_modules/.bin/isparta cover --root src --report lcovonly node_modules/.bin/_mocha -- $npm_package_options_mocha && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js",
     "build": "rimraf lib && babel src --ignore __tests__,public --out-dir lib/ && npm run build:lambda",
     "build:lambda": "NODE_ENV=development netlify-lambda build handler",
     "download": "babel-node scripts/download.js cache/data.json",
     "serve-public": "babel-node scripts/serve-public",
-    "prettier": "prettier --write 'src/**/*.ts'",
+    "prettier": "prettier --write 'src/**/*.js'",
     "print-schema": "babel-node scripts/print-schema.js",
     "store-schema": "babel-node scripts/store-schema.js"
   },
@@ -69,15 +52,10 @@
     "express": "^4.17.1",
     "express-graphql": "^0.9.0",
     "graphql": "14.5.8",
-    "graphql-relay": "^0.6.0"
+    "graphql-relay": "0.6.0"
   },
   "devDependencies": {
     "@babel/core": "^7.12.3",
-<<<<<<< HEAD
-    "@types/graphql-relay": "^0.6.0",
-    "@types/jest": "^26.0.15",
-=======
->>>>>>> c1ad3d9f0abdc1c196b98e10587b844e4a6ec518
     "babel-cli": "^6.26.0",
     "babel-core": "^6.26.3",
     "babel-eslint": "^10.0.3",
@@ -99,8 +77,6 @@
     "jest": "^26.6.3",
     "netlify-lambda": "^1.6.3",
     "prettier": "^1.18.2",
-    "sane": "^4.1.0",
-    "ts-jest": "^26.4.4",
-    "typescript": "^4.1.2"
+    "sane": "^4.1.0"
   }
 }