diff --git a/Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua b/Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua
index 907886cd8..d32411e0b 100644
--- a/Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua	
+++ b/Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua	
@@ -1,9 +1,5 @@
 env.info( '*** MOOSE STATIC INCLUDE START *** ' ) 
-<<<<<<< HEAD
-env.info( 'Moose Generation Timestamp: 20170327_1206' ) 
-=======
-env.info( 'Moose Generation Timestamp: 20170327_1033' ) 
->>>>>>> master
+env.info( 'Moose Generation Timestamp: 20170327_1219' ) 
 local base = _G
 
 Include = {}
diff --git a/Moose Mission Setup/Moose.lua b/Moose Mission Setup/Moose.lua
index 907886cd8..d32411e0b 100644
--- a/Moose Mission Setup/Moose.lua	
+++ b/Moose Mission Setup/Moose.lua	
@@ -1,9 +1,5 @@
 env.info( '*** MOOSE STATIC INCLUDE START *** ' ) 
-<<<<<<< HEAD
-env.info( 'Moose Generation Timestamp: 20170327_1206' ) 
-=======
-env.info( 'Moose Generation Timestamp: 20170327_1033' ) 
->>>>>>> master
+env.info( 'Moose Generation Timestamp: 20170327_1219' ) 
 local base = _G
 
 Include = {}