Fixed merge errors with game_server.py, templates/game.html