Fixed merged on Game.java