updates

Author: penalosa

src/content/changelog/workers/2025-06-17-open-next-ssrf.mdx

@@ -6,13 +6,7 @@ products:
 date: 2025-06-17T01:00:00Z
 ---
 
-<<<<<<< HEAD
-A Server-Side Request Forgery (SSRF) vulnerability was identified in the @opennextjs/cloudflare package, which has been automatically mitigated for all Next.js apps deployed to Cloudflare that use the @opennextjs/cloudflare package.
-||||||| parent of 0aa4c5a3c9 (updates)
-A Server-Side Request Forgery (SSRF) vulnerability was identified in the @opennextjs/cloudflare package, which has been automatically mitigated for all existing deployments.
-=======
-Mitigations have been put in place for all existing and future deployments of sites with the Cloudflare adapter for Open Next in response to an identified Server-Side Request Forgery (SSRF) vulnerability in the `@opennextjs/cloudflare` package
->>>>>>> 0aa4c5a3c9 (updates)
+Mitigations have been put in place for all existing and future deployments of sites with the Cloudflare adapter for Open Next in response to an identified Server-Side Request Forgery (SSRF) vulnerability in the `@opennextjs/cloudflare` package.
 
 The vulnerability stemmed from an unimplemented feature in the Cloudflare adapter for Open Next, which allowed users to proxy arbitrary remote content via the `/_next/image` endpoint.