fixed another merge conflict, this time in game.py