Fixed merge errors
Fixed issue with selecting trip end points that have a unique geocode
Fix merge issues with trip_planner