Update CHANGELOG.md

CHANGELOG.md

@@ -7,21 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
-<<<<<<< middleware-always-set-status-code-on-duration-attrs
-- `opentelemetry-instrumentation-django` Handle exceptions from request/response hooks
-  ([#2153](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2153))
-- `opentelemetry-instrumentation-asyncio` instrumented `asyncio.wait_for` properly raises `asyncio.TimeoutError` as expected
-  ([#2637](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2637))
-- `opentelemetry-instrumentation-aws-lambda` Bugfix: AWS Lambda event source key incorrect for SNS in instrumentation library. 
-  ([#2612](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2612))
-- `opentelemetry-instrumentation-system-metrics` Permit to use psutil 6.0+.
-  ([#2630](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2630))
-- `opentelemetry-instrumentation-asgi` Bugfix: Middleware did not set status code attribute on duration metrics for non-recording spans. 
-  ([#2627](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2627))
-
-
-=======
->>>>>>> main
 ### Added
 
 - `opentelemetry-instrumentation-pyramid` Record exceptions raised when serving a request
@@ -74,6 +59,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#2153](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2153))
 - `opentelemetry-instrumentation-asgi` Removed `NET_HOST_NAME` AND `NET_HOST_PORT` from active requests count attribute
   ([#2610](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2610))
+- `opentelemetry-instrumentation-asgi` Bugfix: Middleware did not set status code attribute on duration metrics for non-recording spans. 
+  ([#2627](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2627))
 
 
 ## Version 1.25.0/0.46b0 (2024-05-31)