Added Chatroom "Nice to have"
Fixed conflicts