diff --git a/src/platforms/electron/createWindow.js b/src/platforms/electron/createWindow.js
index 60f9658f1..a51930dfd 100644
--- a/src/platforms/electron/createWindow.js
+++ b/src/platforms/electron/createWindow.js
@@ -37,7 +37,7 @@ export default appState => {
   };
   const lbryProto = 'lbry://';
   const lbryProtoQ = 'lbry://?';
-  const rendererURL = isDev ? `http://localhost:${WEBPACK_ELECTRON_PORT}` : `file://${__dirname}/index-electron.html`;
+  const rendererURL = isDev ? `http://localhost:${WEBPACK_ELECTRON_PORT}` : `file://${__dirname}/index.html`;
 
   let window = new BrowserWindow(windowConfiguration);
 
diff --git a/src/platforms/web/server.js b/src/platforms/web/server.js
index 468093e03..9d9a3dcf5 100644
--- a/src/platforms/web/server.js
+++ b/src/platforms/web/server.js
@@ -55,7 +55,7 @@ const defaultHead =
   '<meta property="og:image" content="/og.png" />';
 
 app.get('*', async (req, res) => {
-  let html = readFileSync(path.join(__dirname, '/index-web.html'), 'utf8');
+  let html = readFileSync(path.join(__dirname, '/index.html'), 'utf8');
   const urlPath = req.path.substr(1); // trim leading slash
 
   if (urlPath.match(/^([^@/:]+)\/([^:/]+)$/)) {
diff --git a/static/locales/en.json b/static/locales/en.json
index b50c841a7..c5706e90b 100644
--- a/static/locales/en.json
+++ b/static/locales/en.json
@@ -672,7 +672,6 @@
   "Hindi": "Hindi",
   "Greek": "Greek",
   "Hide": "Hide",
-<<<<<<< HEAD
   "'contentName' should no longer be used. Use 'streamName' instead": "'contentName' should no longer be used. Use 'streamName' instead",
   "Sorry, we can't preview this file.": "Sorry, we can't preview this file.",
   "View File": "View File",
@@ -682,29 +681,3 @@
   "Unblock": "Unblock",
   "You have blocked this channel content.": "You have blocked this channel content."
 }
-=======
-  "Network and Data Settings": "Network and Data Settings",
-  "Save all viewed content to your downloads directory": "Save all viewed content to your downloads directory",
-  "Paid content and some file types are saved by default. Changing this setting will not affect previously downloaded content.": "Paid content and some file types are saved by default. Changing this setting will not affect previously downloaded content.",
-  "Save hosting data to help the LBRY network": "Save hosting data to help the LBRY network",
-  "If disabled, LBRY will be very sad and you won't be helping improve the network.": "If disabled, LBRY will be very sad and you won't be helping improve the network.",
-  "Floating video player": "Floating video player",
-  "Keep content playing in the corner when navigating to a different page.": "Keep content playing in the corner when navigating to a different page.",
-  "Blocked Channels": "Blocked Channels",
-  "blocked": "blocked",
-  "channels": "channels",
-  "Manage": "Manage",
-  "Automatic dark mode": "Automatic dark mode",
-  "Hide wallet balance in header": "Hide wallet balance in header",
-  "Max Connections": "Max Connections",
-  "For users with good bandwidth, try a higher value to improve streaming and download speeds. Low bandwidth users may benefit from a lower setting. Default is 4.": "For users with good bandwidth, try a higher value to improve streaming and download speeds. Low bandwidth users may benefit from a lower setting. Default is 4.",
-  "This will clear the application cache. Your wallet will not be affected. Currently, followed tags and blocked channels will be cleared.": "This will clear the application cache. Your wallet will not be affected. Currently, followed tags and blocked channels will be cleared.",
-  "'contentName' should no longer be used. Use 'streamName' instead": "'contentName' should no longer be used. Use 'streamName' instead",
-  "LBRY Download Complete": "LBRY Download Complete",
-  "Sorry, we can't preview this file.": "Sorry, we can't preview this file.",
-  "View File": "View File",
-  "Close": "Close",
-  "Catching up...": "Catching up...",
-  "%s blocks behind": "%s blocks behind"
-}
->>>>>>> 404 Page
diff --git a/webpack.electron.config.js b/webpack.electron.config.js
index 656a5d452..396d926aa 100644
--- a/webpack.electron.config.js
+++ b/webpack.electron.config.js
@@ -46,11 +46,11 @@ let mainConfig = {
       {
         from: `${STATIC_ROOT}/`,
         to: `${DIST_ROOT}/electron/static/`,
-        ignore: ['font/**/*', 'index-electron.html'],
+        ignore: ['font/**/*', 'index-web.html'],
       },
       {
         from: `${STATIC_ROOT}/index-electron.html`,
-        to: `${DIST_ROOT}/electron/static/index-electron.html`,
+        to: `${DIST_ROOT}/electron/static/index.html`,
       },
     ]),
   ],
diff --git a/webpack.web.config.js b/webpack.web.config.js
index 1a5b3530f..9cf1a6a38 100644
--- a/webpack.web.config.js
+++ b/webpack.web.config.js
@@ -52,7 +52,7 @@ const webConfig = {
     new CopyWebpackPlugin([
       {
         from: `${STATIC_ROOT}/index-web.html`,
-        to: `${DIST_ROOT}/web/index-web.html`,
+        to: `${DIST_ROOT}/web/index.html`,
       },
       {
         from: `${STATIC_ROOT}/img/favicon.ico`,