New changelog for 5.15

CHANGELOG.md

@@ -1,3 +1,11 @@
+## Unreleased
+
+### Features
+
+### Bug Fixes
+
+- Network errors raised in `Sentry::HTTPTransport` will no longer be reported to Sentry [#2178](https://github.com/getsentry/sentry-ruby/pull/2178)
+
 ## 5.14.0
 
 ### Features
@@ -24,13 +32,9 @@
 
 - Fixed a deprecation in `sidekiq-ruby` error handler [#2160](https://github.com/getsentry/sentry-ruby/pull/2160)
 - Avoid invoking ActiveSupport::BroadcastLogger if not defined [#2169](https://github.com/getsentry/sentry-ruby/pull/2169)
-<<<<<<< HEAD
 - Respect custom `Delayed::Job.max_attempts` if it's defined [#2176](https://github.com/getsentry/sentry-ruby/pull/2176)
-<<<<<<< HEAD
 - Fixed a bug where `Net::HTTP` instrumentation won't work for some IPv6 addresses [#2180](https://github.com/getsentry/sentry-ruby/pull/2180)
 - Allow non-string error message to be reported to sentry ([#2137](https://github.com/getsentry/sentry-ruby/pull/2137))
-- Network errors raised in `Sentry::HTTPTransport` will no longer be reported to Sentry [#2177](https://github.com/getsentry/sentry-ruby/pull/2177)
-- Respect custom `Delayed::Job.max_attempts` if it's defined [#2177](https://github.com/getsentry/sentry-ruby/pull/2177)
 
 ## 5.13.0