Fixes so that only players from upcoming games are shown
Fixing merge conflict