fix conflict

Author: mrbadri

src/content/learn/add-react-to-an-existing-project.md

@@ -24,11 +24,7 @@ title: اضافه کردن ری‌اکت به یک پروژه موجود
 2. **`/some-app` را به‌عنوان *مسیر پایه*** در پیکربندی فریم‌ورک خود مشخص کنید (راهنما: [Next.js](https://nextjs.org/docs/app/api-reference/config/next-config-js/basePath)، [Gatsby](https://www.gatsbyjs.com/docs/how-to/previews-deploys-hosting/path-prefix/)).
 3. **سرور یا پروکسی خود را پیکربندی کنید** تا همه درخواست‌های زیر مسیر `/some-app/` توسط اپلیکیشن ری‌اکت شما مدیریت شوند.
 
-<<<<<<< HEAD
-این کار تضمین می‌کند که بخش ری‌اکت اپلیکیشن شما می‌تواند از [بهترین شیوه‌های موجود](/learn/build-a-react-app-from-scratch#consider-using-a-framework) که در این فریم‌ورک‌ها تعبیه شده‌اند بهره‌مند شود.  
-=======
-This ensures the React part of your app can [benefit from the best practices](/learn/build-a-react-app-from-scratch#consider-using-a-framework) baked into those frameworks.
->>>>>>> 27d86ffe6ec82e3642c6490d2187bae2271020a4
+این کار تضمین می‌کند که بخش ری‌اکتِ اپلیکیشن شما می‌تواند از [بهترین شیوه‌ها](/learn/build-a-react-app-from-scratch#consider-using-a-framework) تعبیه‌شده در آن فریم‌ورک‌ها بهره‌مند شود.
 
 بسیاری از فریم‌ورک‌های مبتنی بر ری‌اکت فول‌استک هستند و به اپلیکیشن ری‌اکت شما اجازه می‌دهند از قابلیت‌های سرور استفاده کند. با این حال، حتی اگر نتوانید یا نخواهید جاوااسکریپت را روی سرور اجرا کنید، می‌توانید از همان رویکرد استفاده کنید. در این حالت، خروجی HTML/CSS/JS را (خروجی [`next export`](https://nextjs.org/docs/advanced-features/static-html-export) در Next.js یا حالت پیش‌فرض در Gatsby) در مسیر `/some-app/` سرو کنید.  
 

src/content/reference/react/Activity.md

@@ -51,11 +51,7 @@ While hidden, children still re-render in response to new props, albeit at a low
 
 When the boundary becomes <CodeStep step={3}>visible</CodeStep> again, React will reveal the children with their previous state restored, and re-create their Effects.
 
-<<<<<<< HEAD
-In this way, Activity can thought of as a mechanism for rendering "background activity". Rather than completely discarding content that's likely to become visible again, you can use Activity to maintain and restore that content's UI and internal state, while ensuring hidden content has no unwanted side effects.
-=======
 In this way, Activity can be thought of as a mechanism for rendering "background activity". Rather than completely discarding content that's likely to become visible again, you can use Activity to maintain and restore that content's UI and internal state, while ensuring that your hidden content has no unwanted side effects.
->>>>>>> 27d86ffe6ec82e3642c6490d2187bae2271020a4
 
 [See more examples below.](#usage)
 
@@ -66,23 +62,15 @@ In this way, Activity can be thought of as a mechanism for rendering "background
 
 #### Caveats {/*caveats*/}
 
-<<<<<<< HEAD
-- When used with `<ViewTransition>`, hidden activities that reveal in a transition will activate an "enter" animation. Visible Activities hidden in a transition will activate an "exit" animation.
-=======
 - If an Activity is rendered inside of a [ViewTransition](/reference/react/ViewTransition), and it becomes visible as a result of an update caused by [startTransition](/reference/react/startTransition), it will activate the ViewTransition's `enter` animation. If it becomes hidden, it will activate its `exit` animation.
->>>>>>> 27d86ffe6ec82e3642c6490d2187bae2271020a4
 
 ---
 
 ## Usage {/*usage*/}
 
 ### Restoring the state of hidden components {/*restoring-the-state-of-hidden-components*/}
 
-<<<<<<< HEAD
-Typically in React, when you want to conditionally show or hide a component, you mount and unmount it:
-=======
 In React, when you want to conditionally show or hide a component, you typically mount or unmount it based on that condition:
->>>>>>> 27d86ffe6ec82e3642c6490d2187bae2271020a4
 
 ```jsx
 {isShowingSidebar && (
@@ -100,19 +88,12 @@ When you hide a component using an Activity boundary instead, React will "save"
 </Activity>
 ```
 
-<<<<<<< HEAD
-This makes it possible to restore components to their previous state.
 
-The following example has a sidebar with an expandable section – you can press "Overview" to reveal the three subitems below it. The main app area also has a button that hides and shows the sidebar.
-
-Try expanding the Overview section, then toggling the sidebar closed and open:
-=======
 This makes it possible to hide and then later restore components in the state they were previously in.
 
 The following example has a sidebar with an expandable section. You can press "Overview" to reveal the three subitems below it. The main app area also has a button that hides and shows the sidebar.
 
 Try expanding the Overview section, and then toggling the sidebar closed then open:
->>>>>>> 27d86ffe6ec82e3642c6490d2187bae2271020a4
 
 <Sandpack>
 

src/sidebarHome.json

@@ -15,17 +15,8 @@
       "path": "/learn/installation"
     },
     {
-<<<<<<< HEAD
       "title": "کامپایلر ری‌اکت",
       "path": "/learn/react-compiler"
-=======
-      "title": "React Compiler",
-      "path": "/learn/react-compiler"
-    },
-    {
-      "hasSectionHeader": true,
-      "sectionHeader": "LEARN REACT"
->>>>>>> 27d86ffe6ec82e3642c6490d2187bae2271020a4
     },
     {
       "hasSectionHeader": true,
@@ -89,27 +80,7 @@
     },
     {
       "hasSectionHeader": true,
-<<<<<<< HEAD
       "sectionHeader": "API کامپایلر ری‌اکت"
-=======
-      "sectionHeader": "REACT COMPILER API"
-    },
-    {
-      "title": "Configuration",
-      "path": "/reference/react-compiler/configuration"
-    },
-    {
-      "title": "Directives",
-      "path": "/reference/react-compiler/directives"
-    },
-    {
-      "title": "Compiling Libraries",
-      "path": "/reference/react-compiler/compiling-libraries"
-    },
-    {
-      "hasSectionHeader": true,
-      "sectionHeader": "GET INVOLVED"
->>>>>>> 27d86ffe6ec82e3642c6490d2187bae2271020a4
     },
     {
       "title": "پیکربندی",

src/sidebarLearn.json

@@ -57,16 +57,11 @@
       ]
     },
     {
-<<<<<<< HEAD
       "title": "کامپایلر ری‌اکت",
-=======
-      "title": "React Compiler",
->>>>>>> 27d86ffe6ec82e3642c6490d2187bae2271020a4
       "path": "/learn/react-compiler",
       "canary": true,
       "routes": [
         {
-<<<<<<< HEAD
           "title": "مقدمه",
           "path": "/learn/react-compiler/introduction"
         },
@@ -80,21 +75,6 @@
         },
         {
           "title": "دیباگ و رفع اشکال",
-=======
-          "title": "Introduction",
-          "path": "/learn/react-compiler/introduction"
-        },
-        {
-          "title": "Installation",
-          "path": "/learn/react-compiler/installation"
-        },
-        {
-          "title": "Incremental Adoption",
-          "path": "/learn/react-compiler/incremental-adoption"
-        },
-        {
-          "title": "Debugging and Troubleshooting",
->>>>>>> 27d86ffe6ec82e3642c6490d2187bae2271020a4
           "path": "/learn/react-compiler/debugging"
         }
       ]