gtfs merge fixes