misc clean up and adding trip duplication to info page
fixed merge to handle coincident stops