diff --git a/main.js b/main.js
index eb5711dc438396462673a5cf607752139a7fce25..38e3bedf32efa93a6ad840e91ae901070142e62e 100644
--- a/main.js
+++ b/main.js
@@ -1,14 +1,3 @@
-<<<<<<< HEAD
-const logger = require.main.require('./common/logger.js');
-const electron = require('electron');
-const { app, BrowserWindow, ipcRenderer } = require('electron');
-const { globalShortcut } = require('electron');
-const { ipcMain } = require('electron');
-const { fork, spawn } = require('child_process');
-const fs = require('fs');
-const db = require.main.require('./common/db.js');
-const lkt = require.main.require('./common/lkt.js');
-=======
 const logger = require.main.require('./common/logger.js'),
     electron = require('electron'),
     { app, BrowserWindow, globalShortcut, ipcMain } = require('electron'),
@@ -16,7 +5,6 @@ const logger = require.main.require('./common/logger.js'),
     fs = require('fs'),
     db = require.main.require('./common/db.js'),
     lkt = require.main.require('./common/lkt.js');
->>>>>>> origin/master
 var tail = require('tail').Tail;
 var client; /* Sub process for the express server */
 var lektor; /* Sub process, the lektord player */