Fix room

Fixed room merge conflict.