merging back from trail-analyzer