Fix package.json conflict

examples/lab/package.json

@@ -10,11 +10,7 @@
   },
   "dependencies": {
     "es6-promise": "^3.1.2",
-<<<<<<< HEAD
-    "jupyter-js-services": "^0.12.3",
-=======
     "jupyter-js-services": "^0.12.4",
->>>>>>> c9f42bd... Use the terminal session from services
     "jupyterlab": "file:../../",
     "phosphide": "^0.9.5"
   },