added my suggestion to our trip
fixed conflicts
yes cleveland