itinerary styling
merge conflicts