diff --git a/receiver/cloudfoundryreceiver/go.sum b/receiver/cloudfoundryreceiver/go.sum
index c05974b62892..177321730408 100644
--- a/receiver/cloudfoundryreceiver/go.sum
+++ b/receiver/cloudfoundryreceiver/go.sum
@@ -106,7 +106,6 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-<<<<<<< HEAD
 go.opentelemetry.io/collector/client v1.21.0 h1:3Kes8lOFMYVxoxeAmX+DTEAkuS1iTA3NkSfqzGmygJA=
 go.opentelemetry.io/collector/client v1.21.0/go.mod h1:jYJGiL0UA975OOyHmjbQSokNWt1OiviI5KjPOMUMGwc=
 go.opentelemetry.io/collector/component v0.115.0 h1:iLte1oCiXzjiCnaOBKdsXacfFiECecpWxW3/LeriMoo=
@@ -161,62 +160,6 @@ go.opentelemetry.io/collector/receiver/receiverprofiles v0.115.0 h1:R9JLaj2Al93s
 go.opentelemetry.io/collector/receiver/receiverprofiles v0.115.0/go.mod h1:05E5hGujWeeXJmzKZwTdHyZ/+rRyrQlQB5p5Q2XY39M=
 go.opentelemetry.io/collector/receiver/receivertest v0.115.0 h1:OiB684SbHQi6/Pd3ZH0cXjYvCpBS9ilQBfTQx0wVXHg=
 go.opentelemetry.io/collector/receiver/receivertest v0.115.0/go.mod h1:Y8Z9U/bz9Xpyt8GI8DxZZgryw3mnnIw+AeKVLTD2cP8=
-=======
-go.opentelemetry.io/collector/client v1.20.1-0.20241202231142-b9ff1bc54c99 h1:3mlZe+7+SczzcWDCjNCpqOvvT0CFuIuWBSbhmowqExY=
-go.opentelemetry.io/collector/client v1.20.1-0.20241202231142-b9ff1bc54c99/go.mod h1:TLbm9uUH9hvB5HS1IUarZUf4JZ/jBo9XtKZPiKpudRI=
-go.opentelemetry.io/collector/component v0.114.1-0.20241202231142-b9ff1bc54c99 h1:4Qgv+nQcKMtU1EiJJ1AI6ZjvtBKDqMny7vgNmez+PIM=
-go.opentelemetry.io/collector/component v0.114.1-0.20241202231142-b9ff1bc54c99/go.mod h1:nku5BEDLa/uHU5TmuhI/xIqxcls3jxFBYMZ7r5fogRA=
-go.opentelemetry.io/collector/component/componentstatus v0.114.1-0.20241202231142-b9ff1bc54c99 h1:r05FrOjJnS4gZh8xUNvM3VVxKleIkQtSljtZpnUy/rw=
-go.opentelemetry.io/collector/component/componentstatus v0.114.1-0.20241202231142-b9ff1bc54c99/go.mod h1:r2idgJcCFlOG1DnVTFL1djg/R6gB5nXqQ0/x7mZbJ8E=
-go.opentelemetry.io/collector/component/componenttest v0.114.1-0.20241202231142-b9ff1bc54c99 h1:vDC4/nshyQUr22EIsU/0E6V2JTGd1UGThFvdJug3S8Y=
-go.opentelemetry.io/collector/component/componenttest v0.114.1-0.20241202231142-b9ff1bc54c99/go.mod h1:EAgQWnt/3myDSscuGiy/j9eNH28PTzounz0g4ZiO6H4=
-go.opentelemetry.io/collector/config/configauth v0.114.1-0.20241202231142-b9ff1bc54c99 h1:3gMhjBdAd80cBEFaTSK0umeGgl4dXMBk2hg5kXowklA=
-go.opentelemetry.io/collector/config/configauth v0.114.1-0.20241202231142-b9ff1bc54c99/go.mod h1:Zajw+6LSoRY//QrAiSlr5Q1SoNyfhjMpkbxry0yxMAI=
-go.opentelemetry.io/collector/config/configcompression v1.20.1-0.20241202231142-b9ff1bc54c99 h1:zse/yfMYTrsq8zLsTMFPhzML5W3XDZmyUe5MWqLRxgM=
-go.opentelemetry.io/collector/config/configcompression v1.20.1-0.20241202231142-b9ff1bc54c99/go.mod h1:LvYG00tbPTv0NOLoZN0wXq1F5thcxvukO8INq7xyfWU=
-go.opentelemetry.io/collector/config/confighttp v0.114.1-0.20241202231142-b9ff1bc54c99 h1:duqNanq+QrrX9WLTueDAQsk4F7QlSzvbstGv5U6I/m0=
-go.opentelemetry.io/collector/config/confighttp v0.114.1-0.20241202231142-b9ff1bc54c99/go.mod h1:HKFJaUatT8Sz+HQvuc6AIWq5YdaHRiU9DSHPHwH60is=
-go.opentelemetry.io/collector/config/configopaque v1.20.1-0.20241202231142-b9ff1bc54c99 h1:2qdaRyZOrl4hEPIWK5jmfCYpvRZhnBCOL1FxEYLIc/I=
-go.opentelemetry.io/collector/config/configopaque v1.20.1-0.20241202231142-b9ff1bc54c99/go.mod h1:sW0t0iI/VfRL9VYX7Ik6XzVgPcR+Y5kejTLsYcMyDWs=
-go.opentelemetry.io/collector/config/configtelemetry v0.114.1-0.20241202231142-b9ff1bc54c99 h1:MUAZu0h12YUIkk7xN6Ej7zFoGIEuiNrkU+SZsB1K7Ig=
-go.opentelemetry.io/collector/config/configtelemetry v0.114.1-0.20241202231142-b9ff1bc54c99/go.mod h1:SlBEwQg0qly75rXZ6W1Ig8jN25KBVBkFIIAUI1GiAAE=
-go.opentelemetry.io/collector/config/configtls v1.20.1-0.20241202231142-b9ff1bc54c99 h1:seo+MONzNiuVT/fFBcHbl44FKV8A8AiF8kx+B3+wmuI=
-go.opentelemetry.io/collector/config/configtls v1.20.1-0.20241202231142-b9ff1bc54c99/go.mod h1:GCq08P8kzrAQTCuFcIbAE0FnBT5k6fbHivg4qXMPq4U=
-go.opentelemetry.io/collector/config/internal v0.114.1-0.20241202231142-b9ff1bc54c99 h1:y3a93zarABSTYA3JMM823dFcsSTq8tXPZ2oTi4cFzJI=
-go.opentelemetry.io/collector/config/internal v0.114.1-0.20241202231142-b9ff1bc54c99/go.mod h1:OVkadRWlKAoWjHslqjWtBLAne8ceQm8WYT71ZcBWLFc=
-go.opentelemetry.io/collector/confmap v1.20.1-0.20241202231142-b9ff1bc54c99 h1:e1FRUH2cpw2tJIZsPb2tT3rCDiEHfGNCcv+VGBok3vo=
-go.opentelemetry.io/collector/confmap v1.20.1-0.20241202231142-b9ff1bc54c99/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec=
-go.opentelemetry.io/collector/consumer v0.114.1-0.20241202231142-b9ff1bc54c99 h1:tsxZZ0dYwe+KpayIXSTW1KGZ50q2S8CkBATcme0JYoY=
-go.opentelemetry.io/collector/consumer v0.114.1-0.20241202231142-b9ff1bc54c99/go.mod h1:a+qsaCMlPasiNvagcHk4Cxqav64obnvAZXcfwKiDSNE=
-go.opentelemetry.io/collector/consumer/consumererror v0.114.1-0.20241202231142-b9ff1bc54c99 h1:z2yYP5X+Uw6xnR39/kEYAVt/M1Szj6yPWwOEmtY1a18=
-go.opentelemetry.io/collector/consumer/consumererror v0.114.1-0.20241202231142-b9ff1bc54c99/go.mod h1:P+99v7rnTGNQFbI5xjlz8vgSlsHJaCVGoR9zXuXK0rg=
-go.opentelemetry.io/collector/consumer/consumerprofiles v0.114.1-0.20241202231142-b9ff1bc54c99 h1:o2hvtdAa5LtUWE4MwZlt8E8egK3DHoegkSvajXFKdgA=
-go.opentelemetry.io/collector/consumer/consumerprofiles v0.114.1-0.20241202231142-b9ff1bc54c99/go.mod h1:7BDJ1GHpXCWLJw+RpURd3CXxuY3gLYPvRKVlmE2eF9o=
-go.opentelemetry.io/collector/consumer/consumertest v0.114.1-0.20241202231142-b9ff1bc54c99 h1:07Nfz41W/oHCwgukN4dSGiWukvV+Qlw3orcAnBbl5wA=
-go.opentelemetry.io/collector/consumer/consumertest v0.114.1-0.20241202231142-b9ff1bc54c99/go.mod h1:iRrx9sufNHWIhDXLz90wnOdktxR8CX+bzyTmQj+pJzY=
-go.opentelemetry.io/collector/extension v0.114.1-0.20241202231142-b9ff1bc54c99 h1:yZxs0XBmn2XXDc2Q00piKvn14vY+cUKcFY3fz27ZokM=
-go.opentelemetry.io/collector/extension v0.114.1-0.20241202231142-b9ff1bc54c99/go.mod h1:SCtPVAo5c1MHwgXr7XJo37rCJc8STHZ5HSwZufnAIpI=
-go.opentelemetry.io/collector/extension/auth v0.114.1-0.20241202231142-b9ff1bc54c99 h1:bzT942QqvmIUD8DLqsY+39bZJ8YpHKdTVnDAHwySK/Q=
-go.opentelemetry.io/collector/extension/auth v0.114.1-0.20241202231142-b9ff1bc54c99/go.mod h1:sbt6n2tJMZCPQV4MncIZqpvbQU+RaZTVIkOiuAfTkhY=
-go.opentelemetry.io/collector/extension/auth/authtest v0.0.0-20241120164440-f2e05b5089bb h1:V4fAUC+ioHs/14AmbrQNuDXVRKccHeZTQHsk1GdVHXQ=
-go.opentelemetry.io/collector/extension/auth/authtest v0.0.0-20241120164440-f2e05b5089bb/go.mod h1:Q44897dcHvUTV2k3NcEdI1pXY1KFTD3fdZJ4qXowezs=
-go.opentelemetry.io/collector/featuregate v1.20.1-0.20241202231142-b9ff1bc54c99 h1:Ldq+OT15oQg7c2GrDodSvfyvnolIqm/dG9n1FzH159o=
-go.opentelemetry.io/collector/featuregate v1.20.1-0.20241202231142-b9ff1bc54c99/go.mod h1:3GaXqflNDVwWndNGBJ1+XJFy3Fv/XrFgjMN60N3z7yg=
-go.opentelemetry.io/collector/pdata v1.20.1-0.20241202231142-b9ff1bc54c99 h1:GQL2ns6l/rdmKyMgIivnIVyBf2DK2pkif+l/a4exlss=
-go.opentelemetry.io/collector/pdata v1.20.1-0.20241202231142-b9ff1bc54c99/go.mod h1:GKb1/zocKJMvxKbS+sl0W85lxhYBTFJ6h6I1tphVyDU=
-go.opentelemetry.io/collector/pdata/pprofile v0.114.1-0.20241202231142-b9ff1bc54c99 h1:zh5wDejDWQm/H3Dv+aVF2mnWMbkrOmAvoUO8NlW5Lw4=
-go.opentelemetry.io/collector/pdata/pprofile v0.114.1-0.20241202231142-b9ff1bc54c99/go.mod h1:1rWPNiz6qNS+wWb1u7RV/at2cKC/kUqXF6fs04ZMCoM=
-go.opentelemetry.io/collector/pdata/testdata v0.114.0 h1:+AzszWSL1i4K6meQ8rU0JDDW55SYCXa6FVqfDixhhTo=
-go.opentelemetry.io/collector/pdata/testdata v0.114.0/go.mod h1:bv8XFdCTZxG2MQB5l9dKxSxf5zBrcodwO6JOy1+AxXM=
-go.opentelemetry.io/collector/pipeline v0.114.1-0.20241202231142-b9ff1bc54c99 h1:iVjoHmLCr+kWJmKbLckEYZomuLI5HxSPMtdYQtF+vV0=
-go.opentelemetry.io/collector/pipeline v0.114.1-0.20241202231142-b9ff1bc54c99/go.mod h1:qE3DmoB05AW0C3lmPvdxZqd/H4po84NPzd5MrqgtL74=
-go.opentelemetry.io/collector/receiver v0.114.1-0.20241202231142-b9ff1bc54c99 h1:YttCCAggvvWM0368LkRo2fyxIFq9F0WY+Tos9jZgMXg=
-go.opentelemetry.io/collector/receiver v0.114.1-0.20241202231142-b9ff1bc54c99/go.mod h1:OUwqoatCob1TNNXZQAwTKeoK0iY70ggWnLsrxyVdG2Q=
-go.opentelemetry.io/collector/receiver/receiverprofiles v0.114.1-0.20241202231142-b9ff1bc54c99 h1:J+fVN/COezMJcu89pC2SEOEfGk6VYpcqkRPXUDs0Es4=
-go.opentelemetry.io/collector/receiver/receiverprofiles v0.114.1-0.20241202231142-b9ff1bc54c99/go.mod h1:+7Vv46YQ493yuiSnyUPvw6OTbWzdf/ym+oWdNKzdawk=
-go.opentelemetry.io/collector/receiver/receivertest v0.114.1-0.20241202231142-b9ff1bc54c99 h1:mKvdB8IjYntZwWlF0PqCytaXoPEKbzAOjXxNu2hqxfQ=
-go.opentelemetry.io/collector/receiver/receivertest v0.114.1-0.20241202231142-b9ff1bc54c99/go.mod h1:x457Z8VzHtpPWL7/d4baWawdP/vFUFa+YVwfYBFFccU=
->>>>>>> 8d75948162 (go mod tidy)
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 h1:UP6IpuHFkUgOQL9FFQFrZ+5LiwhhYRbi7VZSIx6Nj5s=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0/go.mod h1:qxuZLtbq5QDtdeSHsS7bcf6EH6uO6jUAgk764zd3rhM=
 go.opentelemetry.io/otel v1.32.0 h1:WnBN+Xjcteh0zdk01SVqV55d/m62NJLJdIyb4y/WO5U=