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 f878cae10..1cc562db9 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: 20160811_0937' ) 
+=======
+env.info( 'Moose Generation Timestamp: 20160810_0820' ) 
+>>>>>>> refs/remotes/origin/master
 local base = _G
 
 Include = {}
@@ -21944,7 +21948,11 @@ function SPAWN:_RandomizeRoute( SpawnIndex )
       SpawnTemplate.route.points[t].y = SpawnTemplate.route.points[t].y + math.random( self.SpawnRandomizeRouteRadius * -1, self.SpawnRandomizeRouteRadius )
       
       -- Manage randomization of altitude for airborne units ...
+<<<<<<< HEAD
       if SpawnTemplate.CategoryID == Group.Category.AIRPLANE or SpawnTemplate.CategoryID == Group.Category.HELICOPTER then
+=======
+      if SpawnTemplate.SpawnCategoryID == Group.Category.AIRPLANE or SpawnTemplate.SpawnCategoryID == Group.Category.HELICOPTER then
+>>>>>>> refs/remotes/origin/master
         if SpawnTemplate.route.points[t].alt and self.SpawnRandomizeRouteHeight then
           SpawnTemplate.route.points[t].alt = SpawnTemplate.route.points[t].alt + math.random( 1, self.SpawnRandomizeRouteHeight )
         end
diff --git a/Moose Mission Setup/Moose.lua b/Moose Mission Setup/Moose.lua
index f878cae10..99882d4a9 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: 20160811_0937' ) 
+=======
+env.info( 'Moose Generation Timestamp: 20160810_0820' ) 
+>>>>>>> refs/remotes/origin/master
 local base = _G
 
 Include = {}