got some chatroom information propagating to the db
fixed small merge conflict