solve merge conflicts in game.html
fix: player names
fix: import request, session in test