fixed compile errors in Game.java
merged Game.java