WaitingRoom participant logic
Solved conflicts