merge to add chatroom