Update reqwest-tracing/CHANGELOG.md

Co-authored-by: Dan King <daniel.zidan.king@gmail.com>

Author: AdamGS

reqwest-tracing/CHANGELOG.md

@@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+<<<<<<< HEAD
 
 - Added support fro OpenTelemetry `0.31` ([#250](https://github.com/TrueLayer/reqwest-middleware/pull/250))
 
@@ -14,6 +15,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Updated `reqwest` to `0.13`
+=======
+- Added support for OpenTelemetry `0.31` ([#249](https://github.com/TrueLayer/reqwest-middleware/pull/249))
+>>>>>>> db17e8f (Update reqwest-tracing/CHANGELOG.md)
 
 ## [0.5.8] - 2025-06-16