fix: fix merge conflicts with develop branch

Author: Sam H

CHANGELOG.md

@@ -1,7 +1,7 @@
 {
   "name": "@openforge/main-website",
   "private": true,
-  "version": "1.4.4",
+  "version": "2.0.2",
   "description": "The official website for OpenForge",
   "files": [
     "dist/"
@@ -26,35 +26,37 @@
   "dependencies": {
     "@stencil/sass": "0.0.3",
     "@types/i18next": "^8.4.3",
-    "i18next": "^11.3.2"
+    "i18next": "^11.3.2",
+    "jquery": "^3.3.1",
+    "sticky-sidebar": "^3.3.1"
   },
   "devDependencies": {
-    "@stencil/core": "^0.10.0",
+    "@commitlint/cli": "^6.1.3",
+    "@commitlint/config-conventional": "^6.1.3",
+    "@stencil/core": "^0.11.4",
     "@stencil/dev-server": "0.0.19-0",
-    "@stencil/router": "^0.2.4",
+    "@stencil/router": "0.2.5",
     "@stencil/state-tunnel": "0.0.6",
     "@stencil/utils": "latest",
-    "@commitlint/cli": "^6.1.3",
-    "@commitlint/config-conventional": "^6.1.3",
+    "@types/mocha": "^5.2.0",
     "@types/smoothscroll-polyfill": "^0.3.0",
+    "bootstrap": "^4.2.1",
     "commitizen": "^2.9.6",
     "conventional-changelog-cli": "^1.3.22",
+    "cypress": "^2.1.0",
     "cz-conventional-changelog": "^2.1.0",
     "husky": "^0.15.0-rc.13",
     "jest": "^21.2.1",
     "lint-staged": "^7.0.4",
     "prettier": "^1.12.1",
     "rxjs-compat": "^6.1.0",
     "sass-lint": "^1.12.1",
+    "smoothscroll-polyfill": "^0.4.3",
     "tslint": "^5.9.1",
     "tslint-config-airbnb": "^5.8.0",
     "tslint-config-prettier": "^1.12.0",
     "tslint-react": "^3.5.1",
     "typescript": "^2.8.3",
-    "@types/mocha": "^5.2.0",
-    "bootstrap": "^4.1.0",
-    "cypress": "^2.1.0",
-    "smoothscroll-polyfill": "^0.4.3",
     "xvfb": "^0.2.3"
   },
   "repository": {

README.md

@@ -1,5 +1,5 @@
 module.exports = {
-  printWidth: 80,
+  printWidth: 200,
   tabWidth: 2,
   useTabs: false,
   semi: true,