Fix merge conflicts

circle.yml

@@ -7,9 +7,7 @@ machine:
   environment:
     PATH: "${PATH}:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin"
     NODE_ENV: "test"
-
-dependencies:
-  override:
+  pre:
     # TODO: use the following to add in support for MongoDB 3.4.
     # # Upgrade the database version to 3.4.
     # - sudo apt-get purge mongodb-org*
@@ -19,10 +17,20 @@ dependencies:
     # - sudo apt-get install -y mongodb-org
     # - sudo service mongod restart
 
+    # Install chromium for e2e and remove old google-chrome
+    - sudo rm -rf /opt/google/chrome
+    - sudo rm -f /usr/bin/google-chrome*
+    - sudo apt-get update
+    - sudo apt-get install chromium-browser
+
+dependencies:
+  override:
+
     # Install node dependencies.
     - yarn --version
     - yarn global add node-gyp nsp --force
     - yarn
+
   post:
     # Build the static assets.
     - yarn build
@@ -42,6 +50,7 @@ test:
     - MOCHA_FILE=$CIRCLE_TEST_REPORTS/junit/test-results.xml MOCHA_REPORTER=mocha-junit-reporter yarn test
     # Check dependancies using nsp.
     - nsp check
+    - yarn e2e-ci
 
 deployment:
   release: