diff --git a/NOCQ.userprefs b/NOCQ.userprefs
deleted file mode 100644
index bfd823d..0000000
--- a/NOCQ.userprefs
+++ /dev/null
@@ -1,35 +0,0 @@
-<Properties>
-  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="src/NOCQ/DB/RedisQueues.cs">
-    <Files>
-      <File FileName="src/NOCQ/DB/RedisDataase.cs" Line="10" Column="15" />
-      <File FileName="src/NOCQ/Plugins/Email/ImapInput.cs" Line="19" Column="8" />
-      <File FileName="src/NOCQ/Plugins/Email/ParseRule.cs" Line="5" Column="25" />
-      <File FileName="src/NOCQ/Model/Alert.cs" Line="5" Column="21" />
-      <File FileName="src/NOCQ/Plugins/Email/EmailSettings.cs" Line="6" Column="28" />
-      <File FileName="src/NOCQ/Imports/DataImports.cs" Line="1" Column="1" />
-      <File FileName="src/NOCQ/Imports/IDataImportHook.cs" Line="1" Column="1" />
-      <File FileName="src/NOCQ/DB/RedisQueues.cs" Line="13" Column="1" />
-    </Files>
-    <Pads>
-      <Pad Id="ProjectPad">
-        <State expanded="True">
-          <Node name="NOCQ" expanded="True">
-            <Node name="DB" expanded="True">
-              <Node name="RedisQueues.cs" selected="True" />
-            </Node>
-            <Node name="Model" expanded="True" />
-            <Node name="Plugins" expanded="True">
-              <Node name="Email" expanded="True" />
-            </Node>
-            <Node name="Properties" expanded="True" />
-          </Node>
-        </State>
-      </Pad>
-    </Pads>
-  </MonoDevelop.Ide.Workbench>
-  <MonoDevelop.Ide.DebuggingService.Breakpoints>
-    <BreakpointStore />
-  </MonoDevelop.Ide.DebuggingService.Breakpoints>
-  <MonoDevelop.Ide.DebuggingService.PinnedWatches />
-</Properties>
\ No newline at end of file
diff --git a/src/NOCQ.Application/Program.cs b/src/NOCQ.Application/Program.cs
index c443a52..be77610 100644
--- a/src/NOCQ.Application/Program.cs
+++ b/src/NOCQ.Application/Program.cs
@@ -25,6 +25,7 @@ namespace NOCQ.Application
 				});
 
 			//RedisDatabase.SaveAlert(, "127.0.0.1", RedisQueues.Output, 6379, 3000);
+
 			// Parse the settings file
 			var json = System.IO.File.ReadAllText ("settings.json");
 			var settings = SettingsParser.Parse (json);
diff --git a/src/NOCQ/Plugins/Email/ImapInput.cs b/src/NOCQ/Plugins/Email/ImapInput.cs
index 5e1660a..2e69c57 100644
--- a/src/NOCQ/Plugins/Email/ImapInput.cs
+++ b/src/NOCQ/Plugins/Email/ImapInput.cs
@@ -4,11 +4,9 @@ using AE.Net.Mail;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
-<<<<<<< HEAD
 using System.ComponentModel.Composition;
-=======
 using Newtonsoft.Json.Linq;
->>>>>>> de89a87aa5549aaa31cb301c1a98fff6336c7aeb
+
 
 namespace NOCQ.Plugins.Email
 {