heartbeat google charts erin, tripinfo herordend
fixed merge