colors for itinaries
fixing merge conflicts