diff --git a/src/EVEMon.Common/Resources/MD5Sums.txt b/src/EVEMon.Common/Resources/MD5Sums.txt
index d8c78c0db..845dbeb87 100644
--- a/src/EVEMon.Common/Resources/MD5Sums.txt
+++ b/src/EVEMon.Common/Resources/MD5Sums.txt
@@ -3,12 +3,6 @@ c3e6655e8322fa6f3cf0632fe60786c9 *eve-blueprints-en-US.xml.gzip
 0d58b21ab445f316241589ef91fffc24 *eve-geography-en-US.xml.gzip
 e4c1c54c78c0fa96ab5f794f910f9fec *eve-items-en-US.xml.gzip
 3668b50996fc40a0c0853fec427b5712 *eve-masteries-en-US.xml.gzip
-<<<<<<< HEAD
 1f6ae9f613fd26b08d5ec206d0958d79 *eve-properties-en-US.xml.gzip
 adb83f4fc55f61a58548dcb924a91cfe *eve-reprocessing-en-US.xml.gzip
 727a781211b138cf331afed346692962 *eve-skills-en-US.xml.gzip
-=======
-61b82db0e043794f29e2c743ea8342ce *eve-properties-en-US.xml.gzip
-0e841f8ae3f5a3b2a72bed26aa395a91 *eve-reprocessing-en-US.xml.gzip
-2a5dc71d4ee37f93aed9462335a0be26 *eve-skills-en-US.xml.gzip
->>>>>>> temp_vegt2
diff --git a/src/EVEMon/Program.cs b/src/EVEMon/Program.cs
index 6da1015e9..9f754508c 100644
--- a/src/EVEMon/Program.cs
+++ b/src/EVEMon/Program.cs
@@ -31,14 +31,14 @@ internal static class Program
         [STAThread]
         private static void Main()
         {
-            StartupAsync();//.Wait();
+            StartupAsync().Wait();
         }
 
         /// <summary>
         /// Starts up the application asynchronously.
         /// </summary>
         /// <returns></returns>
-        private static /*async Task*/ void StartupAsync()
+        private static async Task StartupAsync()
         {
             // Quits if another instance already exists
             if (!IsInstanceUnique)
@@ -90,9 +90,9 @@ private static void Main()
                 EveMonClient.Trace("Main loop - done", printMethod: false);
 
                 // Save before we quit
-                //await Task.WhenAll(Settings.SaveImmediateAsync(), EveIDToName.SaveImmediateAsync());
-                Settings.SaveImmediateAsync().Wait();
-                EveIDToName.SaveImmediateAsync().Wait();
+                await Task.WhenAll(Settings.SaveImmediateAsync(), EveIDToName.SaveImmediateAsync());
+                //Settings.SaveImmediateAsync().Wait();
+                //EveIDToName.SaveImmediateAsync().Wait();
             }
             finally
             {