diff --git a/Moose Mission Setup/Moose.lua b/Moose Mission Setup/Moose.lua
index a020b3125..15e738d18 100644
--- a/Moose Mission Setup/Moose.lua	
+++ b/Moose Mission Setup/Moose.lua	
@@ -1,5 +1,9 @@
 env.info( '*** MOOSE DYNAMIC INCLUDE START *** ' )
+<<<<<<< HEAD
 env.info( 'Moose Generation Timestamp: 20171021_1218' )
+=======
+env.info( 'Moose Generation Timestamp: 20171023_1007' )
+>>>>>>> master
 
 local base = _G
 
@@ -36,6 +40,7 @@ __Moose.Include( 'Core/Zone.lua' )
 __Moose.Include( 'Core/Database.lua' )
 __Moose.Include( 'Core/Set.lua' )
 __Moose.Include( 'Core/Point.lua' )
+__Moose.Include( 'Core/Velocity.lua' )
 __Moose.Include( 'Core/Message.lua' )
 __Moose.Include( 'Core/Fsm.lua' )
 __Moose.Include( 'Core/Radio.lua' )