merge
merge conflict
TODO: make_game_single_team