Add the missing top level package.json

package.json

@@ -38,12 +38,18 @@
     "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",
+>>>>>>> fda919b... Add the missing top level package.json
     "karma": "^0.13.19",
     "karma-chrome-launcher": "^0.2.2",
     "karma-coverage": "^0.5.3",
@@ -69,8 +75,13 @@
     "build:examples": "node scripts/buildexamples.js",
     "build:src": "tsc --project src && node scripts/copyfiles.js",
     "build:test": "webpack --config test/webpack.conf.js",
+<<<<<<< HEAD
     "build:serverextension": "cd jupyterlab && webpack",
     "clean": "rimraf docs && rimraf lib && rimraf test/build && rimraf test/coverage && rimraf jupyterlab/build",
+=======
+    "build:serverextension": "cd jupyterlab && npm run build && cd ..",
+    "clean": "rimraf docs && rimraf lib && rimraf test/build && rimraf test/coverage",
+>>>>>>> fda919b... Add the missing top level package.json
     "clean:all": "npm run clean && cd jupyterlab && npm run clean && cd ..",
     "clean:examples": "node scripts/cleanexamples.js",
     "clean:slate": "npm run clean:all && npm run clean:examples && rimraf jupyterlab/node_modules && rimraf node_modules && npm install && cd jupyterlab && npm install && cd ..",