Fixed merge conflicts, room pages working