Fixed merging traces