diff --git a/src/content/learn/creating-a-react-app.md b/src/content/learn/creating-a-react-app.md
index 759b3b69cf..1dd251b46c 100644
--- a/src/content/learn/creating-a-react-app.md
+++ b/src/content/learn/creating-a-react-app.md
@@ -106,7 +106,11 @@ Next.js 的 App Router 还集成了 [使用 Suspense 的数据获取](/blog/2022
 
 从零开始可以给你更多的灵活性，但同时也要求你必须自己选择用于路由、数据获取以及其他常见使用模式的工具。这更像自己构建一个框架，而不是使用一个已经存在的框架。[我们推荐的框架](#full-stack-frameworks) 为这些问题提供了内置的解决方案。
 
+<<<<<<< HEAD
 如果你想构建自己的解决方案，请参阅我们的 [从零构建一个 React 应用](/learn/build-a-react-app-from-scratch) 指南，该指南提供了如何使用 [Vite](https://vite.dev/)， [Parcel](https://parceljs.org/)，或 [RSbuild](https://rsbuild.dev/) 等构建工具设置新 React 项目的说明。
+=======
+If you want to build your own solutions, see our guide to [build a React app from Scratch](/learn/build-a-react-app-from-scratch) for instructions on how to set up a new React project starting with a build tool like [Vite](https://vite.dev/), [Parcel](https://parceljs.org/), or [RSbuild](https://rsbuild.dev/).
+>>>>>>> 4bea66b021679e307f3ccb05fdd8fbdf80dd04d7
 
 -----
 
diff --git a/src/content/reference/react-dom/client/hydrateRoot.md b/src/content/reference/react-dom/client/hydrateRoot.md
index f90db9f264..b83908bbca 100644
--- a/src/content/reference/react-dom/client/hydrateRoot.md
+++ b/src/content/reference/react-dom/client/hydrateRoot.md
@@ -380,12 +380,13 @@ It is uncommon to call [`root.render`](#root-render) on a hydrated root. Usually
 
 By default, React will log all errors to the console. To implement your own error reporting, you can provide the optional error handler root options `onUncaughtError`, `onCaughtError` and `onRecoverableError`:
 
-```js [[1, 6, "onCaughtError"], [2, 6, "error", 1], [3, 6, "errorInfo"], [4, 10, "componentStack", 15]]
+```js [[1, 7, "onCaughtError"], [2, 7, "error", 1], [3, 7, "errorInfo"], [4, 11, "componentStack", 15]]
 import { hydrateRoot } from "react-dom/client";
+import App from "./App.js";
 import { reportCaughtError } from "./reportError";
 
 const container = document.getElementById("root");
-const root = hydrateRoot(container, {
+const root = hydrateRoot(container, <App />, {
   onCaughtError: (error, errorInfo) => {
     if (error.message !== "Known error") {
       reportCaughtError({
diff --git a/src/content/reference/rsc/server-functions.md b/src/content/reference/rsc/server-functions.md
index d296938943..9cfcdb33bd 100644
--- a/src/content/reference/rsc/server-functions.md
+++ b/src/content/reference/rsc/server-functions.md
@@ -54,7 +54,7 @@ function EmptyNote () {
 }
 ```
 
-When React renders the `EmptyNote` Server Function, it will create a reference to the `createNoteAction` function, and pass that reference to the `Button` Client Component. When the button is clicked, React will send a request to the server to execute the `createNoteAction` function with the reference provided:
+When React renders the `EmptyNote` Server Component, it will create a reference to the `createNoteAction` function, and pass that reference to the `Button` Client Component. When the button is clicked, React will send a request to the server to execute the `createNoteAction` function with the reference provided:
 
 ```js {5}
 "use client";
diff --git a/src/content/versions.md b/src/content/versions.md
index 08c1dab438..7d4690c7d2 100644
--- a/src/content/versions.md
+++ b/src/content/versions.md
@@ -10,8 +10,13 @@ React 文档位于 [react.dev](https://react.dev)，提供最新版本 React 的
 
 我们致力于在主要版本内保持文档的更新，并不会为每个次要版本或补丁版本发布单独的文档版本。当一个新的主要版本发布时，我们会将前一个版本的文档存档为 `x.react.dev`。有关更多信息，请参阅我们的[版本控制政策](/community/versioning-policy)。
 
+<<<<<<< HEAD
 你可以在下方找到以前主要版本的存档。
 ## 最新版本：19.0 {/*latest-version*/}
+=======
+You can find an archive of previous major versions below.
+## Latest version: 19.1 {/*latest-version*/}
+>>>>>>> 4bea66b021679e307f3ccb05fdd8fbdf80dd04d7
 
 - [react.dev](https://react.dev) {/*docs-19*/}
 
@@ -50,7 +55,12 @@ React 文档位于 [react.dev](https://react.dev)，提供最新版本 React 的
 - [React Compiler Case Studies](https://www.youtube.com/watch?v=lvhPq5chokM)
 - [React 19 Deep Dive: Coordinating HTML](https://www.youtube.com/watch?v=IBBN-s77YSI)
 
+<<<<<<< HEAD
 **发布版本**
+=======
+**Releases**
+- [v19.1.0 (March, 2025)](https://github.com/facebook/react/blob/main/CHANGELOG.md#1910-march-28-2025)
+>>>>>>> 4bea66b021679e307f3ccb05fdd8fbdf80dd04d7
 - [v19.0.0 (December, 2024)](https://github.com/facebook/react/blob/main/CHANGELOG.md#1900-december-5-2024)
 
 ### React 18 {/*react-18*/}