Engine to Game
Fixes merge conflicts
Fixes to build