diff --git a/package.json b/package.json
index 40b42b943..e0b454bd1 100644
--- a/package.json
+++ b/package.json
@@ -27,10 +27,16 @@
"@docsearch/css": "^3.9.0",
"@docsearch/react": "^3.9.0",
"@headlessui/react": "^1.7.0",
+<<<<<<< HEAD
"@radix-ui/react-context-menu": "^2.2.6",
"body-scroll-lock": "^3.1.5",
"classnames": "^2.5.1",
"date-fns": "^2.16.1",
+=======
+ "@radix-ui/react-context-menu": "^2.1.5",
+ "body-scroll-lock": "^3.1.3",
+ "classnames": "^2.2.6",
+>>>>>>> 84a56968d92b9a9e9bbac1ca13011e159e815dc1
"debounce": "^1.2.1",
"github-slugger": "^1.3.0",
"next": "15.1.7",
diff --git a/src/content/learn/scaling-up-with-reducer-and-context.md b/src/content/learn/scaling-up-with-reducer-and-context.md
index 91fb6803f..fe1762d8e 100644
--- a/src/content/learn/scaling-up-with-reducer-and-context.md
+++ b/src/content/learn/scaling-up-with-reducer-and-context.md
@@ -685,7 +685,7 @@ Now you don't need to pass the list of tasks or the event handlers down the tree
```
-Instead, any component that needs the task list can read it from the `TaskContext`:
+Instead, any component that needs the task list can read it from the `TasksContext`:
```js {2}
export default function TaskList() {
diff --git a/src/content/reference/react-dom/client/createRoot.md b/src/content/reference/react-dom/client/createRoot.md
index adc6a8d37..cb533ec78 100644
--- a/src/content/reference/react-dom/client/createRoot.md
+++ b/src/content/reference/react-dom/client/createRoot.md
@@ -90,7 +90,7 @@ React will display `` in the `root`, and take over managing the DOM insid
* If you call `render` on the same root more than once, React will update the DOM as necessary to reflect the latest JSX you passed. React will decide which parts of the DOM can be reused and which need to be recreated by ["matching it up"](/learn/preserving-and-resetting-state) with the previously rendered tree. Calling `render` on the same root again is similar to calling the [`set` function](/reference/react/useState#setstate) on the root component: React avoids unnecessary DOM updates.
-* Although rendering is synchronous once it starts, `root.render(...)` is not. This means code after `root.render()` may run before any effects (`useLayoutEffect`, `useEffect`) of that specific render are fired. This is usually fine and rarely needs adjustment. In rare cases where effect timing matters, you can wrap `root.render(...)` in [`flushSync`](https://react.dev/reference/react-dom/client/flushSync) to ensure the initial render runs fully synchronously.
+* Although rendering is synchronous once it starts, `root.render(...)` is not. This means code after `root.render()` may run before any effects (`useLayoutEffect`, `useEffect`) of that specific render are fired. This is usually fine and rarely needs adjustment. In rare cases where effect timing matters, you can wrap `root.render(...)` in [`flushSync`](https://react.dev/reference/react-dom/flushSync) to ensure the initial render runs fully synchronously.
```js
const root = createRoot(document.getElementById('root'));
diff --git a/src/content/reference/react/forwardRef.md b/src/content/reference/react/forwardRef.md
index 5b0e679b8..d035b9741 100644
--- a/src/content/reference/react/forwardRef.md
+++ b/src/content/reference/react/forwardRef.md
@@ -6,7 +6,7 @@ title: forwardRef
In React 19, `forwardRef` is no longer necessary. Pass `ref` as a prop instead.
-`forwardRef` will deprecated in a future release. Learn more [here](/blog/2024/04/25/react-19#ref-as-a-prop).
+`forwardRef` will be deprecated in a future release. Learn more [here](/blog/2024/04/25/react-19#ref-as-a-prop).
diff --git a/src/content/reference/rsc/directives.md b/src/content/reference/rsc/directives.md
index c17bcf3a8..fe614fb27 100644
--- a/src/content/reference/rsc/directives.md
+++ b/src/content/reference/rsc/directives.md
@@ -10,7 +10,7 @@ Directives are for use in [React Server Components](/reference/rsc/server-compon
-Directives provide instructions to [bundlers compatible with React Server Components](/learn/start-a-new-react-project#bleeding-edge-react-frameworks).
+Directives provide instructions to [bundlers compatible with React Server Components](/learn/start-a-new-react-project#full-stack-frameworks).
diff --git a/src/content/reference/rsc/server-components.md b/src/content/reference/rsc/server-components.md
index 9e6ab11eb..f27fa8b86 100644
--- a/src/content/reference/rsc/server-components.md
+++ b/src/content/reference/rsc/server-components.md
@@ -4,7 +4,7 @@ title: Server Components
-Server Components are for use in [React Server Components](/learn/start-a-new-react-project#bleeding-edge-react-frameworks).
+Server Components are for use in [React Server Components](/learn/start-a-new-react-project#full-stack-frameworks).
@@ -22,7 +22,7 @@ This separate environment is the "server" in React Server Components. Server Com
#### How do I build support for Server Components? {/*how-do-i-build-support-for-server-components*/}
-While React Server Components in React 19 are stable and will not break between minor versions, the underlying APIs used to implement a React Server Components bundler or framework do not follow semver and may break between minors in React 19.x.
+While React Server Components in React 19 are stable and will not break between minor versions, the underlying APIs used to implement a React Server Components bundler or framework do not follow semver and may break between minors in React 19.x.
To support React Server Components as a bundler or framework, we recommend pinning to a specific React version, or using the Canary release. We will continue working with bundlers and frameworks to stabilize the APIs used to implement React Server Components in the future.
@@ -45,7 +45,7 @@ function Page({page}) {
setContent(data.content);
});
}, [page]);
-
+
return {sanitizeHtml(marked(content))}
;
}
```
@@ -69,7 +69,7 @@ import sanitizeHtml from 'sanitize-html'; // Not included in bundle
async function Page({page}) {
// NOTE: loads *during* render, when the app is built.
const content = await file.readFile(`${page}.md`);
-
+
return {sanitizeHtml(marked(content))}
;
}
```
@@ -113,7 +113,7 @@ function Note({id}) {
setNote(data.note);
});
}, [id]);
-
+
return (
@@ -253,7 +253,7 @@ This works by first rendering `Notes` as a Server Component, and then instructin
this is the second note
-
+
```
@@ -270,8 +270,8 @@ import db from './database';
async function Page({id}) {
// Will suspend the Server Component.
const note = await db.notes.get(id);
-
- // NOTE: not awaited, will start here and await on the client.
+
+ // NOTE: not awaited, will start here and await on the client.
const commentsPromise = db.comments.get(note.id);
return (