updated changelog

Author: antonpirker

CHANGELOG.md

@@ -1,6 +1,5 @@
 # Changelog
 
-<<<<<<< HEAD
 ## 3.0.0a2
 
 We're excited to announce that version 3.0 of the Sentry Python SDK is now
@@ -40,7 +39,7 @@ for your feedback. How was the migration? Is everything working as expected? Is
 *nothing* working as expected? Something in between? Please let us know
 [on GitHub](https://github.com/getsentry/sentry-python/discussions/3936) or
 [on Discord](https://discord.com/invite/Ww9hbqr).
-=======
+
 ## 2.33.1
 
 ### Various fixes & improvements
@@ -51,7 +50,6 @@ for your feedback. How was the migration? Is everything working as expected? Is
 - Remove explicit `__del__`'s in threaded classes (#4590) by @sl0thentr0py
 - Remove forked from test_transport, separate gevent tests and generalize capturing_server to be module level (#4577) by @sl0thentr0py
 - Improve token usage recording (#4566) by @antonpirker
->>>>>>> master
 
 ## 2.33.0