fixed merge conflicts in lobby.ccb