manual merge of pixilLobby