diff --git a/megamek/docs/OfficialUnitList.txt b/megamek/docs/OfficialUnitList.txt
index 3ea56749658..45b0082a74d 100644
--- a/megamek/docs/OfficialUnitList.txt
+++ b/megamek/docs/OfficialUnitList.txt
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 Megamek Official Unit List
 This file can be regenerated with java -jar MegaMek.jar -oul
 Format is: Chassis Model|
@@ -1935,7 +1934,7 @@ Scout Infantry The Battle Corps - Baker Street Irregulars|
 Hover Assault Infantry Johnston Industries Rapid Response Force|
 Foot Infantry Raventhir's Infantry Guard|
 Bridge-builder Engineers Take the Time III-chi, Forty-eighth Division|
-Heavy Mountain Infantry Cavalier “Mountain Men” Infantry Guard, Magistracy Cavaliers|
+Heavy Mountain Infantry Cavalier 'Mountain Men' Infantry Guard, Magistracy Cavaliers|
 Motorized Heavy Infantry Motstand/Mimir Troop|
 Heavy Foot LRM Infantry Stalwart Support - Heavy LRM Infantry|
 Ceremonial Guard Otomo Guard|
@@ -6091,5 +6090,3 @@ Minotaur P2|
 Satyr XP|
 Procyon (Quad)|
 Svartalfa Ultra|
-=======
->>>>>>> branch 'master' of ssh://git@github.com/MegaMek/megamek.git
diff --git a/megamek/docs/history.txt b/megamek/docs/history.txt
index 596bd9cd61b..b60c5baf60d 100644
--- a/megamek/docs/history.txt
+++ b/megamek/docs/history.txt
@@ -1,6 +1,6 @@
 VERSION HISTORY:
 ----------------
-v0.41.17-git
+v0.41.17
 + Data: New Sprites and Unit Date Fixes.
 
 v0.41.16 (2016-04-10 21:53 UTC)
diff --git a/megamek/src/megamek/MegaMek.java b/megamek/src/megamek/MegaMek.java
index ee3e5ab12d4..3e402f27248 100644
--- a/megamek/src/megamek/MegaMek.java
+++ b/megamek/src/megamek/MegaMek.java
@@ -63,7 +63,7 @@
  */
 public class MegaMek {
 
-    public static String VERSION = "0.41.17-git"; //$NON-NLS-1$
+    public static String VERSION = "0.41.17"; //$NON-NLS-1$
     public static long TIMESTAMP = new File(PreferenceManager
             .getClientPreferences().getLogDirectory()
             + File.separator