resolve conflict

Author: ajaymathur

package.json

@@ -35,6 +35,8 @@
   },
   "dependencies": {
     "@aparna036/babel-explode-module": "^2.0.1",
+    "@atlaskit/code": "^11.0.6",
+    "@atlaskit/css-reset": "^5.0.4",
     "@babel/core": "^7.4.4",
     "@babel/plugin-syntax-flow": "^7.2.0",
     "@babel/plugin-syntax-jsx": "^7.2.0",
@@ -56,6 +58,7 @@
     "babel-type-scopes": "^1.1.0",
     "babylon": "^7.0.0-beta.22",
     "babylon-options": "^2.0.1",
+    "bolt": "^0.22.6",
     "eslint": "^5.13.0",
     "eslint-config-airbnb": "^17.1.0",
     "eslint-config-prettier": "^4.0.0",
@@ -65,25 +68,38 @@
     "eslint-plugin-prettier": "^3.0.1",
     "eslint-plugin-react": "^7.12.4",
     "jest-in-case": "^1.0.2",
+    "lz-string": "^1.4.4",
     "preconstruct": "^0.0.81",
+    "react": "^16.3.1",
+    "react-codemirror": "^1.0.0",
+    "react-dom": "^16.3.1",
+    "react-markdown": "^4.0.6",
     "react-markings": "^1.2.0",
+    "react-router-dom": "^5.0.1",
     "resolve": "^1.10.1",
-    "strip-indent": "^2.0.0"
+    "strip-indent": "^2.0.0",
+    "styled-components": "^4.3.2"
   },
   "devDependencies": {
+    "@babel/core": "^7.4.4",
     "@babel/plugin-proposal-class-properties": "^7.4.4",
     "@babel/plugin-transform-runtime": "^7.4.4",
     "@babel/preset-env": "^7.4.4",
     "@babel/preset-flow": "^7.0.0",
     "@babel/preset-react": "^7.0.0",
+    "babel-loader": "^8.0.5",
     "babel-jest": "^24.7.1",
     "babel-plugin-emotion": "^10.0.14",
+    "copy-webpack-plugin": "^5.0.2",
+    "css-loader": "^2.1.1",
     "enzyme": "^3.3.0",
     "enzyme-adapter-react-16": "^1.1.1",
     "flow-bin": "^0.98.0",
+    "html-webpack-plugin": "^3.2.0",
     "jest": "^24.7.1",
     "jest-in-case": "^1.0.2",
     "jsdom": "^11.7.0",
+    "null-loader": "^0.1.1",
     "prettier": "^1.13.7",
     "react": "^16.3.1",
     "react-addons-test-utils": "^15.6.2",
@@ -93,4 +109,4 @@
     "webpack-cli": "^3.3.0",
     "webpack-dev-server": "^3.2.1"
   }
-}
+}

website/package.json

@@ -2,26 +2,26 @@
     "name": "website",
     "version": "0.0.0",
     "dependencies": {
-        "@atlaskit/code": "^9.0.0",
-        "@atlaskit/css-reset": "^3.0.6",
+        "@atlaskit/code": "^11.0.6",
+        "@atlaskit/css-reset": "^5.0.4",
         "bolt": "^0.22.6",
-        "css-loader": "^2.1.1",
-        "extract-react-types": "^0.16.0",
+        "extract-react-types": "^0.21.0",
         "lz-string": "^1.4.4",
         "pretty-proptypes": "^0.6.0",
         "react": "^16.3.1",
         "react-codemirror": "^1.0.0",
         "react-dom": "^16.3.1",
         "react-markdown": "^4.0.6",
-        "react-router-dom": "^5.0.0",
-        "styled-components": "^4.2.0"
+        "react-router-dom": "^5.0.1",
+        "styled-components": "^4.3.2"
     },
     "devDependencies": {
-        "@babel/core": "^7.4.0",
-        "@babel/plugin-proposal-class-properties": "^7.4.0",
-        "@babel/preset-env": "^7.4.2",
+        "@babel/core": "^7.4.4",
+        "@babel/plugin-proposal-class-properties": "^7.4.4",
+        "@babel/preset-env": "^7.4.4",
         "@babel/preset-react": "^7.0.0",
         "babel-loader": "^8.0.5",
+        "css-loader": "^2.1.1",
         "copy-webpack-plugin": "^5.0.2",
         "html-webpack-plugin": "^3.2.0",
         "null-loader": "^0.1.1",
@@ -30,4 +30,4 @@
         "webpack-cli": "^3.3.0",
         "webpack-dev-server": "^3.2.1"
     }
-}
+}