fix conflicts and stuff for updatePlayerLobby