fix conflict

Author: loveloki

src/content/learn/creating-a-react-app.md

@@ -32,11 +32,7 @@ title: 创建一个 React 应用
 npx create-next-app@latest
 </TerminalBlock>
 
-<<<<<<< HEAD
-Next.js 由 [Vercel](https://vercel.com/) 维护。你可以 [将 Next.js 应用部署](https://nextjs.org/docs/app/building-your-application/deploying) 到任何支持 Node.js 或 serverless 的托管平台，或者部署到你自己的服务器。 Next.js 也支持 [静态导出](https://nextjs.org/docs/app/building-your-application/deploying/static-exports) 无需服务器。Vercel 还提供可选的付费云服务。
-=======
-Next.js is maintained by [Vercel](https://vercel.com/). You can [deploy a Next.js app](https://nextjs.org/docs/app/building-your-application/deploying) to any hosting provider that supports Node.js or Docker containers, or to your own server. Next.js also supports [static export](https://nextjs.org/docs/app/building-your-application/deploying/static-exports) which doesn't require a server.
->>>>>>> d05547b9b8268db7a29e80908eddb15dbd863ae6
+Next.js 由 [Vercel](https://vercel.com/) 维护。你可以 [将 Next.js 应用部署](https://nextjs.org/docs/app/building-your-application/deploying) 到任何支持 Node.js 或 Docker 容器的托管平台，或者部署到你自己的服务器。 Next.js 也支持 [静态导出](https://nextjs.org/docs/app/building-your-application/deploying/static-exports) 无需服务器。
 
 ### React Router (v7) {/*react-router-v7*/}
 

src/content/reference/rsc/directives.md

@@ -4,11 +4,7 @@ title: "指示符"
 
 <RSC>
 
-<<<<<<< HEAD
-这些指令用于 [React 服务器组件](/learn/start-a-new-react-project#bleeding-edge-react-frameworks)。
-=======
-Directives are for use in [React Server Components](/reference/rsc/server-components).
->>>>>>> d05547b9b8268db7a29e80908eddb15dbd863ae6
+这些指令用于 [React 服务器组件](/reference/rsc/server-components)。
 
 </RSC>
 

src/content/reference/rsc/use-client.md

@@ -5,11 +5,7 @@ titleForTitleTag: "'use client' 指示符"
 
 <RSC>
 
-<<<<<<< HEAD
-`'use client'` 用于 [React 服务器组件](/learn/start-a-new-react-project#bleeding-edge-react-frameworks)。
-=======
-`'use client'` is for use with [React Server Components](/reference/rsc/server-components).
->>>>>>> d05547b9b8268db7a29e80908eddb15dbd863ae6
+`'use client'` 用于 [React 服务器组件](/reference/rsc/server-components)。
 
 </RSC>
 

src/content/reference/rsc/use-server.md

@@ -5,11 +5,7 @@ titleForTitleTag: "'use server' 指示符"
 
 <RSC>
 
-<<<<<<< HEAD
-`'use server'` 用于 [React 服务器组件](/learn/start-a-new-react-project#bleeding-edge-react-frameworks)。
-=======
-`'use server'` is for use with [using React Server Components](/reference/rsc/server-components).
->>>>>>> d05547b9b8268db7a29e80908eddb15dbd863ae6
+`'use server'` 用于 [React 服务器组件](/reference/rsc/server-components)。
 
 </RSC>