adding the research of rooms and service
correcting merge conflict