diff --git a/submodules/opentelemetry-operations-collector b/submodules/opentelemetry-operations-collector
index ea5117a622..e62387ad67 160000
--- a/submodules/opentelemetry-operations-collector
+++ b/submodules/opentelemetry-operations-collector
@@ -1 +1 @@
-Subproject commit ea5117a62228047145280051edd4148ced90f422
+Subproject commit e62387ad67af5fbfc0edbb453df5741e2534f98e
diff --git a/transformation_test/testdata/logging_processor-iis/output_otel.yaml b/transformation_test/testdata/logging_processor-iis/output_otel.yaml
index cb4044ab87..bfe901672e 100644
--- a/transformation_test/testdata/logging_processor-iis/output_otel.yaml
+++ b/transformation_test/testdata/logging_processor-iis/output_otel.yaml
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 - resourceLogs:
   - resource:
       attributes:
@@ -219,94 +218,3 @@
         observedTimeUnixNano: now
         timeUnixNano: "1771525729000000000"
       scope: {}
-=======
-- entries:
-  - httpRequest:
-      referer: http://localhost/
-      remoteIp: "::1"
-      requestMethod: GET
-      requestUrl: /iisstart.png
-      serverIp: "::1:80"
-      status: 200
-      userAgent: Mozilla/5.0+(Windows+NT+10.0;+WOW64;+Trident/7.0;+rv:11.0)+like+Gecko
-    jsonPayload:
-      sc_substatus: "0"
-      sc_win32_status: "0"
-      time_taken: "18"
-    labels:
-      compute.googleapis.com/resource_name: hostname
-      logging.googleapis.com/instrumentation_source: agent.googleapis.com/iis_access
-    logName: projects/my-project/logs/my-log-name
-    resource:
-      labels:
-        instance_id: test-instance-id
-        zone: test-zone
-      type: gce_instance
-    timestamp: 2022-03-11T01:26:30Z
-  - httpRequest:
-      remoteIp: "::1"
-      requestMethod: GET
-      requestUrl: /
-      serverIp: "::1:80"
-      status: 200
-      userAgent: Mozilla/5.0+(Windows+NT+10.0;+WOW64;+Trident/7.0;+rv:11.0)+like+Gecko
-    jsonPayload:
-      sc_substatus: "0"
-      sc_win32_status: "0"
-      time_taken: "352"
-    labels:
-      compute.googleapis.com/resource_name: hostname
-      logging.googleapis.com/instrumentation_source: agent.googleapis.com/iis_access
-    logName: projects/my-project/logs/my-log-name
-    resource:
-      labels:
-        instance_id: test-instance-id
-        zone: test-zone
-      type: gce_instance
-    timestamp: 2022-03-11T01:26:30Z
-  - httpRequest:
-      remoteIp: "::1"
-      requestMethod: GET
-      requestUrl: /favicon.ico
-      serverIp: "::1:80"
-      status: 404
-      userAgent: Mozilla/5.0+(Windows+NT+10.0;+WOW64;+Trident/7.0;+rv:11.0)+like+Gecko
-    jsonPayload:
-      sc_substatus: "0"
-      sc_win32_status: "2"
-      time_taken: "49"
-    labels:
-      compute.googleapis.com/resource_name: hostname
-      logging.googleapis.com/instrumentation_source: agent.googleapis.com/iis_access
-    logName: projects/my-project/logs/my-log-name
-    resource:
-      labels:
-        instance_id: test-instance-id
-        zone: test-zone
-      type: gce_instance
-    timestamp: 2022-03-11T01:26:32Z
-  - httpRequest:
-      remoteIp: "::1"
-      requestMethod: GET
-      requestUrl: /forbidden?something=something
-      serverIp: "::1:80"
-      status: 404
-      userAgent: Mozilla/5.0+(Windows+NT;+Windows+NT+10.0;+en-US)+WindowsPowerShell/5.1.26100.32370
-    jsonPayload:
-      cs_bytes: "184"
-      sc_bytes: "5035"
-      sc_substatus: "0"
-      sc_win32_status: "2"
-      time_taken: "189"
-    labels:
-      compute.googleapis.com/resource_name: hostname
-      logging.googleapis.com/instrumentation_source: agent.googleapis.com/iis_access
-    logName: projects/my-project/logs/my-log-name
-    resource:
-      labels:
-        instance_id: test-instance-id
-        zone: test-zone
-      type: gce_instance
-    timestamp: 2026-02-19T18:28:49Z
-  partialSuccess: true
->>>>>>> master
diff --git a/transformation_test/testdata/logging_processor-iis_access/output_otel.yaml b/transformation_test/testdata/logging_processor-iis_access/output_otel.yaml
index 6f1365ee10..fb2a963017 100644
--- a/transformation_test/testdata/logging_processor-iis_access/output_otel.yaml
+++ b/transformation_test/testdata/logging_processor-iis_access/output_otel.yaml
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 - resourceLogs:
   - resource:
       attributes:
@@ -191,85 +190,3 @@
         observedTimeUnixNano: now
         timeUnixNano: "1771525729000000000"
       scope: {}
-=======
-- entries:
-  - httpRequest:
-      referer: http://localhost/
-      remoteIp: "::1"
-      requestMethod: GET
-      requestUrl: /iisstart.png
-      serverIp: "::1:80"
-      status: 200
-      userAgent: Mozilla/5.0+(Windows+NT+10.0;+WOW64;+Trident/7.0;+rv:11.0)+like+Gecko
-    jsonPayload:
-      sc_substatus: "0"
-      sc_win32_status: "0"
-      time_taken: "18"
-    labels:
-      compute.googleapis.com/resource_name: hostname
-      logging.googleapis.com/instrumentation_source: agent.googleapis.com/iis_access
-    logName: projects/my-project/logs/my-log-name
-    resource:
-      labels:
-        instance_id: test-instance-id
-        zone: test-zone
-      type: gce_instance
-    timestamp: 2022-03-11T01:26:30Z
-  - httpRequest:
-      remoteIp: "::1"
-      requestMethod: GET
-      requestUrl: /
-      serverIp: "::1:80"
-      status: 200
-      userAgent: Mozilla/5.0+(Windows+NT+10.0;+WOW64;+Trident/7.0;+rv:11.0)+like+Gecko
-    jsonPayload:
-      sc_substatus: "0"
-      sc_win32_status: "0"
-      time_taken: "352"
-    labels:
-      compute.googleapis.com/resource_name: hostname
-      logging.googleapis.com/instrumentation_source: agent.googleapis.com/iis_access
-    logName: projects/my-project/logs/my-log-name
-    resource:
-      labels:
-        instance_id: test-instance-id
-        zone: test-zone
-      type: gce_instance
-    timestamp: 2022-03-11T01:26:30Z
-  - httpRequest:
-      serverIp: <nil>:<nil>
-    jsonPayload:
-      message: "2022-03-10 17:26:32 ::1 GET /favicon.ico - 80 - ::1 Mozilla/5.0+(Windows+NT+10.0;+WOW64;+Trident/7.0;+rv:11.0)+like+Gecko - 404 0 2 49 "
-    labels:
-      compute.googleapis.com/resource_name: hostname
-      logging.googleapis.com/instrumentation_source: agent.googleapis.com/iis_access
-    logName: projects/my-project/logs/my-log-name
-    resource:
-      labels:
-        instance_id: test-instance-id
-        zone: test-zone
-      type: gce_instance
-    timestamp: now
-  - httpRequest:
-      remoteIp: "::1"
-      requestMethod: GET
-      requestUrl: /forbidden?something=something
-      serverIp: "::1:80"
-      status: 404
-      userAgent: Mozilla/5.0+(Windows+NT;+Windows+NT+10.0;+en-US)+WindowsPowerShell/5.1.26100.32370
-    jsonPayload:
-      sc_substatus: "0"
-      sc_win32_status: "2"
-      time_taken: "189"
-    labels:
-      compute.googleapis.com/resource_name: hostname
-      logging.googleapis.com/instrumentation_source: agent.googleapis.com/iis_access
-    logName: projects/my-project/logs/my-log-name
-    resource:
-      labels:
-        instance_id: test-instance-id
-        zone: test-zone
-      type: gce_instance
-    timestamp: 2026-02-19T18:28:49Z
-  partialSuccess: true
->>>>>>> master
diff --git a/transformation_test/testdata/ops_agent_test-TestLogEntrySpecialFields/output_otel.yaml b/transformation_test/testdata/ops_agent_test-TestLogEntrySpecialFields/output_otel.yaml
index 6ee22f13b2..bd5057c766 100644
--- a/transformation_test/testdata/ops_agent_test-TestLogEntrySpecialFields/output_otel.yaml
+++ b/transformation_test/testdata/ops_agent_test-TestLogEntrySpecialFields/output_otel.yaml
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 - resourceLogs:
   - resource:
       attributes:
@@ -78,32 +77,3 @@
         spanId: facefeedb0bacafe
         traceId: deadcafedeadc0defacefeedb0bacafe
       scope: {}
-=======
-- entries:
-  - jsonPayload:
-      logging.googleapis.com/operation:
-        first: true
-        id: id
-        last: true
-        producer: producer
-      normal_field: value
-    labels:
-      compute.googleapis.com/resource_name: hostname
-      label1: value1
-      label2: value2
-    logName: projects/my-project/logs/my-log-name
-    resource:
-      labels:
-        instance_id: test-instance-id
-        zone: test-zone
-      type: gce_instance
-    severity: WARNING
-    sourceLocation:
-      file: file
-      function: function
-      line: "1"
-    spanId: facefeedb0bacafe
-    timestamp: now
-    trace: projects/my-project/traces/deadcafedeadc0defacefeedb0bacafe
-  partialSuccess: true
->>>>>>> master