Add trip show view, and route
Merge things