Canadian National, Amtrak back on track, ending 10-year-long dispute over delays