hotels added
fixed conflicts