updated package json

Author: nmwenz90

package.json

@@ -62,13 +62,9 @@
     "@babel/preset-react": "^7.10.4",
     "@types/chrome": "^0.0.119",
     "@types/jest": "^26.0.4",
-<<<<<<< HEAD
-    "@types/node": "^14.0.23",
-=======
     "@types/node": "^12.12.50",
     "@typescript-eslint/eslint-plugin": "^3.6.1",
     "@typescript-eslint/parser": "^3.6.1",
->>>>>>> 24e511f2f701fa79d7fdee42f580beed7a058630
     "babel-loader": "^8.1.0",
     "core-js": "^3.6.5",
     "css-loader": "^3.6.0",