Reword changelog to indicate performance concerns

Author: andreiborza

CHANGELOG.md

@@ -8,7 +8,7 @@
 
 - feat(cloudflare): Add `instrumentPrototypeMethods` option to instrument RPC methods for DurableObjects ([#17424](https://github.com/getsentry/sentry-javascript/pull/17424))
 
-By default, `Sentry.instrumentDurableObjectWithSentry` will not wrap any RPC methods on the prototype. To enable wrapping for RPC methods, set `instrumentPrototypeMethods` to `true` or a list of methods you want to instrument:
+By default, `Sentry.instrumentDurableObjectWithSentry` will not wrap any RPC methods on the prototype. To enable wrapping for RPC methods, set `instrumentPrototypeMethods` to `true` or, if performance is a concern, a list of only the methods you want to instrument:
 
 ```js
 class MyDurableObjectBase extends DurableObject<Env> {
@@ -35,8 +35,6 @@ export const MyDurableObject = Sentry.instrumentDurableObjectWithSentry(
 );
 ```
 
-<<<<<<< HEAD
-
 ## 10.6.0
 
 ### Important Changes
@@ -74,11 +72,6 @@ The Sentry Nuxt SDK is now considered stable and no longer in beta!
 
 </details>
 
-=======
-
-> > > > > > > e3ba48da5f (Formatting fix)
-> > > > > > > Work in this release was contributed by @Karibash. Thank you for your contribution!
-
 ## 10.5.0
 
 - feat(core): better cause data extraction ([#17375](https://github.com/getsentry/sentry-javascript/pull/17375))