Merge traces when lines+markers