diff --git a/package-lock.json b/package-lock.json
index e60992ee3d..78d3d5ec7d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7690,8 +7690,7 @@
           "version": "0.1.1",
           "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
           "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "json-schema": {
           "version": "0.2.3",
diff --git a/server/views/layout-react.jade b/server/views/layout-react.jade
index 58dcebbda9..321048f96d 100644
--- a/server/views/layout-react.jade
+++ b/server/views/layout-react.jade
@@ -23,8 +23,4 @@ html(lang='en').full-size
           fccTheme = null;
         }
       })();
-<<<<<<< 00fc9f0fa407f89275afcecefa495ce0ab4a9973
     script(src=cacheBreaker(rev('/js', 'client-app.js')))
-=======
-    script(src=cacheBreaker(rev('/js', 'bundle.js')))
->>>>>>> chore(unused): Remove unused files