diff --git a/src/content/reference/react-dom/static/prerender.md b/src/content/reference/react-dom/static/prerender.md
index 0fd0e9ee9..8aeecf454 100644
--- a/src/content/reference/react-dom/static/prerender.md
+++ b/src/content/reference/react-dom/static/prerender.md
@@ -68,6 +68,7 @@ On the client, call [`hydrateRoot`](/reference/react-dom/client/hydrateRoot) to
 
 #### Caveats {/*caveats*/}
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 `nonce` is not an available option when prerendering. Nonces must be unique per request and if you use nonces to secure your application with [CSP](https://developer.mozilla.org/en-US/docs/Web/HTTP/Guides/CSP) it would be inappropriate and insecure to include the a nonce value in the prerender itself.
@@ -77,6 +78,9 @@ On the client, call [`hydrateRoot`](/reference/react-dom/client/hydrateRoot) to
 =======
 `nonce` is not an available option when prerendering. Nonces must be unique per request and if you use nonces to secure your application with [CSP](https://developer.mozilla.org/en-US/docs/Web/HTTP/Guides/CSP) it would be inappropriate and insecure to include the nonce value in the prerender itself.
 >>>>>>> 50d6991ca6652f4bc4c985cf0c0e593864f2cc91
+=======
+`nonce` is not an available option when prerendering. Nonces must be unique per request and if you use nonces to secure your application with [CSP](https://developer.mozilla.org/en-US/docs/Web/HTTP/Guides/CSP) it would be inappropriate and insecure to include the nonce value in the prerender itself.
+>>>>>>> 50d6991ca6652f4bc4c985cf0c0e593864f2cc91
 
 
 <Note>
diff --git a/src/content/reference/react-dom/static/prerenderToNodeStream.md b/src/content/reference/react-dom/static/prerenderToNodeStream.md
index 54310067b..85ab385f6 100644
--- a/src/content/reference/react-dom/static/prerenderToNodeStream.md
+++ b/src/content/reference/react-dom/static/prerenderToNodeStream.md
@@ -69,6 +69,7 @@ On the client, call [`hydrateRoot`](/reference/react-dom/client/hydrateRoot) to
 
 #### Caveats {/*caveats*/}
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 `nonce` is not an available option when prerendering. Nonces must be unique per request and if you use nonces to secure your application with [CSP](https://developer.mozilla.org/en-US/docs/Web/HTTP/Guides/CSP) it would be inappropriate and insecure to include the a nonce value in the prerender itself.
@@ -78,6 +79,9 @@ On the client, call [`hydrateRoot`](/reference/react-dom/client/hydrateRoot) to
 =======
 `nonce` is not an available option when prerendering. Nonces must be unique per request and if you use nonces to secure your application with [CSP](https://developer.mozilla.org/en-US/docs/Web/HTTP/Guides/CSP) it would be inappropriate and insecure to include the nonce value in the prerender itself.
 >>>>>>> 50d6991ca6652f4bc4c985cf0c0e593864f2cc91
+=======
+`nonce` is not an available option when prerendering. Nonces must be unique per request and if you use nonces to secure your application with [CSP](https://developer.mozilla.org/en-US/docs/Web/HTTP/Guides/CSP) it would be inappropriate and insecure to include the nonce value in the prerender itself.
+>>>>>>> 50d6991ca6652f4bc4c985cf0c0e593864f2cc91
 
 <Note>
 
diff --git a/src/content/reference/rsc/server-functions.md b/src/content/reference/rsc/server-functions.md
index 99b6288eb..eff148f8a 100644
--- a/src/content/reference/rsc/server-functions.md
+++ b/src/content/reference/rsc/server-functions.md
@@ -28,6 +28,7 @@ To support Server Functions as a bundler or framework, we recommend pinning to a
 
 </Note>
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 When a Server Function is defined with the [`"use server"`](/reference/rsc/use-server) directive, your framework will automatically create a reference to the server function, and pass that reference to the Client Component. When that function is called on the client, React will send a request to the server to execute the function, and return the result.
@@ -37,6 +38,9 @@ When a Server Function is defined with the [`"use server"`](/reference/rsc/use-s
 =======
 When a Server Function is defined with the [`"use server"`](/reference/rsc/use-server) directive, your framework will automatically create a reference to the Server Function, and pass that reference to the Client Component. When that function is called on the client, React will send a request to the server to execute the function, and return the result.
 >>>>>>> 50d6991ca6652f4bc4c985cf0c0e593864f2cc91
+=======
+When a Server Function is defined with the [`"use server"`](/reference/rsc/use-server) directive, your framework will automatically create a reference to the Server Function, and pass that reference to the Client Component. When that function is called on the client, React will send a request to the server to execute the function, and return the result.
+>>>>>>> 50d6991ca6652f4bc4c985cf0c0e593864f2cc91
 
 Server Functions can be created in Server Components and passed as props to Client Components, or they can be imported and used in Client Components.