fixed upp Game.java from the merge