Merge fix for addTrailsToTrailheads()