resolved conficts in Game.java