Restore missing deps

package.json

@@ -38,18 +38,12 @@
     "css-loader": "^0.23.1",
     "expect.js": "^0.3.1",
     "file-loader": "^0.8.5",
-<<<<<<< HEAD
     "font-awesome": "^4.6.3",
     "fs-extra": "^0.26.4",
     "istanbul-instrumenter-loader": "^0.1.3",
     "json-loader": "^0.5.4",
     "json-to-html": "^0.1.2",
     "jupyterlab-extension-builder": "^0.6.2",
-=======
-    "fs-extra": "^0.26.4",
-    "istanbul-instrumenter-loader": "^0.1.3",
-    "json-loader": "^0.5.4",
->>>>>>> e0acbd6... Remove unnecesssary changedirs
     "karma": "^0.13.19",
     "karma-chrome-launcher": "^0.2.2",
     "karma-coverage": "^0.5.3",