Hotel
conflict fix