add test
add rooms model
merge conflict
add user and merge conflict