diff --git a/lib/modules/webserver/backend/index.html b/lib/modules/webserver/backend/index.html
new file mode 100644
index 000000000..01d3caf4f
--- /dev/null
+++ b/lib/modules/webserver/backend/index.html
@@ -0,0 +1 @@
+Welcome to Embark!
diff --git a/lib/modules/webserver/server.js b/lib/modules/webserver/server.js
index 4f2dfe50d..fb9c0089f 100644
--- a/lib/modules/webserver/server.js
+++ b/lib/modules/webserver/server.js
@@ -5,6 +5,8 @@ const expressWebSocket = require('express-ws');
 const express = require('express');
 const fs = require('../../core/fs');
 require('http-shutdown').extend();
+var express = require('express');
+let path = require('path');
 
 class Server {
   constructor(options) {
diff --git a/package.json b/package.json
index 0fa1dc5e2..eea4be4e1 100644
--- a/package.json
+++ b/package.json
@@ -55,6 +55,7 @@
     "eth-lib": "0.2.8",
     "babel-plugin-webpack-aliases": "^1.1.3",
     "ethereumjs-wallet": "0.6.0",
+<<<<<<< HEAD
     "express": "4.16.3",
     "express-ws": "4.0.0",
     "file-loader": "2.0.0",
@@ -71,6 +72,18 @@
     "http-proxy": "1.17.0",
     "http-shutdown": "1.2.0",
     "i18n": "0.8.3",
+=======
+    "express": "^4.16.2",
+    "file-loader": "^1.1.5",
+    "finalhandler": "^1.1.1",
+    "follow-redirects": "^1.2.4",
+    "fs-extra": "^2.0.0",
+    "ganache-cli": "^6.1.6",
+    "glob": "^7.1.2",
+    "globule": "^1.1.0",
+    "hard-source-webpack-plugin": "^0.11.1",
+    "http-proxy": "^1.17.0",
+>>>>>>> add 2nd endpoint to webserver; use express
     "handlebars": "^4.0.11",
     "ipfs-api": "17.2.4",
     "is-valid-domain": "0.0.5",