Merge conflicts in Game.java solved