Resolve merge conflickt
Added room functionality