finishing up crud on Hotel
merge resolve