fix merge commit

src/Elastic.Apm/Model/Transaction.cs

@@ -1,4 +1,4 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
+// Licensed to Elasticsearch B.V under one or more agreements.
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
@@ -116,7 +116,6 @@ internal Transaction(
 					// If an activity was created, reuse its id
 					Id = _activity.SpanId.ToHexString();
 					TraceId = _activity.TraceId.ToHexString();
-					_traceState = _activity.TraceStateString;
 
 					var idBytesFromActivity = new Span<byte>(new byte[16]);
 					_activity.TraceId.CopyTo(idBytesFromActivity);
@@ -190,7 +189,9 @@ internal Transaction(
 							ActivityTraceId.CreateFromString(distributedTracingData.TraceId.AsSpan()),
 							ActivitySpanId.CreateFromString(distributedTracingData.ParentId.AsSpan()),
 							distributedTracingData.FlagRecorded ? ActivityTraceFlags.Recorded : ActivityTraceFlags.None);
-						_activity.TraceStateString = distributedTracingData.TraceState;
+
+						if (distributedTracingData.HasTraceState)
+							_activity.TraceStateString = distributedTracingData.TraceState.ToTextHeader();
 					}
 					catch (Exception e)
 					{