changes for room and messages
add for pull
Conflict resolved