Resolve conflicts, using upstream next 15.1.9 (patched)

Author: smikitky

package.json

@@ -37,11 +37,7 @@
     "classnames": "^2.2.6",
     "debounce": "^1.2.1",
     "github-slugger": "^1.3.0",
-<<<<<<< HEAD
-    "next": "15.4.8",
-=======
     "next": "15.1.9",
->>>>>>> e22544e68d6fffda33332771efe27034739f35a4
     "next-remote-watch": "^1.0.0",
     "parse-numeric-range": "^1.2.0",
     "react": "^19.0.0",

src/content/blog/index.md

@@ -16,17 +16,13 @@ Bluesky の [@react.dev](https://bsky.app/profile/react.dev) や Twitter の [@r
 
 <div className="sm:-mx-5 flex flex-col gap-5 mt-12">
 
-<<<<<<< HEAD
-<BlogCard title="React Conf 2025 振り返り" date="October 16, 2025" url="/blog/2025/10/16/react-conf-2025-recap">
-=======
-<BlogCard title="Critical Security Vulnerability in React Server Components" date="December 3, 2025" url="/blog/2025/12/03/critical-security-vulnerability-in-react-server-components">
+<BlogCard title="React Server Components における重大なセキュリティ脆弱性" date="December 3, 2025" url="/blog/2025/12/03/critical-security-vulnerability-in-react-server-components">
 
-There is an unauthenticated remote code execution vulnerability in React Server Components. A fix has been published in versions 19.0.1, 19.1.2, and 19.2.1. We recommend upgrading immediately.
+React Server Components に、認証不要のリモートコード実行の脆弱性があります。バージョン 19.0.1、19.1.2、19.2.1 で修正が公開されました。直ちにアップグレードすることを推奨します。
 
 </BlogCard>
 
-<BlogCard title="React Conf 2025 Recap" date="October 16, 2025" url="/blog/2025/10/16/react-conf-2025-recap">
->>>>>>> e22544e68d6fffda33332771efe27034739f35a4
+<BlogCard title="React Conf 2025 振り返り" date="October 16, 2025" url="/blog/2025/10/16/react-conf-2025-recap">
 
 先週 React Conf 2025 が開催されました。この投稿では、イベントでの講演と発表内容をまとめます。
 

src/sidebarBlog.json

@@ -12,20 +12,15 @@
       "skipBreadcrumb": true,
       "routes": [
         {
-<<<<<<< HEAD
-          "title": "React Conf 2025 振り返り",
-          "titleForHomepage": "React Conf 2025 振り返り",
-=======
-          "title": "Critical Security Vulnerability in React Server Components",
-          "titleForHomepage": "Vulnerability in React Server Components",
+          "title": "React Server Components における重大なセキュリティ脆弱性",
+          "titleForHomepage": "React Server Components の脆弱性",
           "icon": "blog",
           "date": "December 03, 2025",
           "path": "/blog/2025/12/03/critical-security-vulnerability-in-react-server-components"
         },
         {
-          "title": "React Conf 2025 Recap",
-          "titleForHomepage": "React Conf 2025 Recap",
->>>>>>> e22544e68d6fffda33332771efe27034739f35a4
+          "title": "React Conf 2025 振り返り",
+          "titleForHomepage": "React Conf 2025 振り返り",
           "icon": "blog",
           "date": "October 16, 2025",
           "path": "/blog/2025/10/16/react-conf-2025-recap"