docs(en): merging all conflicts

Author: docschina-bot

src/content/blog/2022/06/15/react-labs-what-we-have-been-working-on-june-2022.md

@@ -27,7 +27,11 @@ description: React 18 经过多年的努力才得以问世，它为 React 团队
 
 特别地，我们放弃了拥有分叉 I/O 库（例如 react-fetch）的想法，转而采用了具有更好兼容性的 async/await 模型。这从技术上讲并不阻碍 RSC 的发布，因为还可以使用路由器进行数据获取。另一个变化是我们也放弃了文件扩展名的方法，而是采用了 [注释边界](https://github.com/reactjs/rfcs/pull/189#issuecomment-1116482278) 的方式。
 
+<<<<<<< HEAD
 我们正在与 Vercel 和 Shopify 合作，在 Webpack 和 Vite 中统一打包器（bundler）对共享语义的支持。在发布之前，我们希望确保整个 React 生态系统中的 RSC 的语义是一致的。这是达到稳定状态的主要障碍。
+=======
+We’re working together with Vercel and Shopify to unify bundler support for shared semantics in both webpack and Vite. Before launch, we want to make sure that the semantics of RSCs are the same across the whole React ecosystem. This is the major blocker for reaching stable.
+>>>>>>> 09f39a07a1abacf92f9c92a6e36102ca2c3be2c7
 
 ## 资源加载 {/*asset-loading*/}
 

src/content/blog/2025/02/14/sunsetting-create-react-app.md

@@ -52,7 +52,7 @@ For existing apps, these guides will help you migrate to a client-only SPA:
 
 * [Next.js’ Create React App migration guide](https://nextjs.org/docs/app/building-your-application/upgrading/from-create-react-app)
 * [React Router’s framework adoption guide](https://reactrouter.com/upgrading/component-routes).
-* [Expo Webpack to Expo Router migration guide](https://docs.expo.dev/router/migrate/from-expo-webpack/)
+* [Expo webpack to Expo Router migration guide](https://docs.expo.dev/router/migrate/from-expo-webpack/)
 
 Create React App will continue working in maintenance mode, and we've published a new version of Create React App to work with React 19.
 
@@ -110,7 +110,7 @@ export default function App() {
   return (
     <div>
       {route === 'home' && <Home />}
-      {route === 'dashboard' && <Dashbord />}
+      {route === 'dashboard' && <Dashboard />}
     </div>
   )
 }

src/content/learn/react-compiler.md

@@ -312,7 +312,11 @@ export default defineConfig({
 
 ### Webpack {/*usage-with-webpack*/}
 
+<<<<<<< HEAD
 由社区提供的 Webpack loader 可以 [在这里找到](https://github.com/SukkaW/react-compiler-webpack)。
+=======
+A community webpack loader is [now available here](https://github.com/SukkaW/react-compiler-webpack).
+>>>>>>> 09f39a07a1abacf92f9c92a6e36102ca2c3be2c7
 
 ### Expo {/*usage-with-expo*/}