Re-instate legacy track segment merging