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 c617f3129..fba4cb4f3 100644
--- a/Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua	
+++ b/Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua	
@@ -1,5 +1,9 @@
 env.info( '*** MOOSE STATIC INCLUDE START *** ' ) 
+<<<<<<< HEAD
 env.info( 'Moose Generation Timestamp: 20170322_2149' ) 
+=======
+env.info( 'Moose Generation Timestamp: 20170322_1812' ) 
+>>>>>>> refs/remotes/origin/master
 local base = _G
 
 Include = {}
diff --git a/Moose Mission Setup/Moose.lua b/Moose Mission Setup/Moose.lua
index c617f3129..fba4cb4f3 100644
--- a/Moose Mission Setup/Moose.lua	
+++ b/Moose Mission Setup/Moose.lua	
@@ -1,5 +1,9 @@
 env.info( '*** MOOSE STATIC INCLUDE START *** ' ) 
+<<<<<<< HEAD
 env.info( 'Moose Generation Timestamp: 20170322_2149' ) 
+=======
+env.info( 'Moose Generation Timestamp: 20170322_1812' ) 
+>>>>>>> refs/remotes/origin/master
 local base = _G
 
 Include = {}