fix: resolved conflicts

Author: neighborhood999

src/content/learn/escape-hatches.md

@@ -312,17 +312,7 @@ React 提供一個 linter 規則，可以驗證你是否已經正確地指定 Ef
 
 ## 從 Effect 分離事件 {/*separating-events-from-effects*/}
 
-<<<<<<< HEAD
-<Wip>
-
-這個章節會介紹一個 **實驗性 API，它還沒有被發布** 在 React 的正式版本。
-
-</Wip>
-
-Event handler 只在你做了相同的互動時才重新執行。與 event handler 不同，假設 Effect 讀取的任何值，像是 prop 或 state，與上一次 render 的不一樣， Effect 就會重新執行同步。有些時候，你想要混合兩種行為：Effect 的重新執行只對某些值反應，而其他的值不會。
-=======
-Event handlers only re-run when you perform the same interaction again. Unlike event handlers, Effects re-synchronize if any of the values they read, like props or state, are different than during last render. Sometimes, you want a mix of both behaviors: an Effect that re-runs in response to some values but not others.
->>>>>>> 11cb6b591571caf5fa2a192117b6a6445c3f2027
+Event handler 只在你再次執行相同的互動時重新執行。與 event handler 不同，如果 Effect 讀取的任何值（例如 props 或 state）與上次渲染時的值不同，則 Effect 會重新同步。有時候，你需要混合使用這兩種行為：即 Effect 會回應某些值而重新執行，而其他值則不會重新執行。
 
 所有在 Effect 中的程式碼都是 *反應性* 的。假如某些它讀取的反應性的值，在 re-render 時發生變化，它就會再執行一次。例如：假如 `roomId` 或 `theme` 之一已經改變，那麼這個 Effect 將會重新連接到聊天室。
 
@@ -392,7 +382,7 @@ export default function App() {
       <hr />
       <ChatRoom
         roomId={roomId}
-        theme={isDark ? 'dark' : 'light'} 
+        theme={isDark ? 'dark' : 'light'}
       />
     </>
   );
@@ -459,13 +449,8 @@ label { display: block; margin-top: 10px; }
 ```json package.json hidden
 {
   "dependencies": {
-<<<<<<< HEAD
-    "react": "canary",
-    "react-dom": "canary",
-=======
     "react": "latest",
     "react-dom": "latest",
->>>>>>> 11cb6b591571caf5fa2a192117b6a6445c3f2027
     "react-scripts": "latest",
     "toastify-js": "1.12.0"
   },
@@ -530,7 +515,7 @@ export default function App() {
       <hr />
       <ChatRoom
         roomId={roomId}
-        theme={isDark ? 'dark' : 'light'} 
+        theme={isDark ? 'dark' : 'light'}
       />
     </>
   );

src/content/learn/removing-effect-dependencies.md

@@ -411,7 +411,7 @@ function Form() {
 
   function handleSubmit() {
     setSubmitted(true);
-  }  
+  }
 
   // ...
 }
@@ -429,7 +429,7 @@ function Form() {
     // ✅ Good: Event-specific logic is called from event handlers
     post('/api/register');
     showNotification('Successfully registered!', theme);
-  }  
+  }
 
   // ...
 }
@@ -612,7 +612,7 @@ function ChatRoom({ roomId }) {
 <<<<<<< HEAD
 <Canary>
 
-**The `useEffectEvent` API is currently only available in React’s Canary and Experimental channels.** 
+**The `useEffectEvent` API is currently only available in React’s Canary and Experimental channels.**
 
 [Learn more about React’s release channels here.](/community/versioning-policy#all-release-channels)
 
@@ -889,7 +889,7 @@ const options2 = { serverUrl: 'https://localhost:1234', roomId: 'music' };
 console.log(Object.is(options1, options2)); // false
 ```
 
-**Object and function dependencies can make your Effect re-synchronize more often than you need.** 
+**Object and function dependencies can make your Effect re-synchronize more often than you need.**
 
 This is why, whenever possible, you should try to avoid objects and functions as your Effect's dependencies. Instead, try moving them outside the component, inside the Effect, or extracting primitive values out of them.
 
@@ -1836,13 +1836,8 @@ Another of these functions only exists to pass some state to an imported API met
 ```json package.json hidden
 {
   "dependencies": {
-<<<<<<< HEAD
-    "react": "canary",
-    "react-dom": "canary",
-=======
     "react": "latest",
     "react-dom": "latest",
->>>>>>> 11cb6b591571caf5fa2a192117b6a6445c3f2027
     "react-scripts": "latest",
     "toastify-js": "1.12.0"
   },
@@ -2136,13 +2131,8 @@ As a result, the chat re-connects only when something meaningful (`roomId` or `i
 ```json package.json hidden
 {
   "dependencies": {
-<<<<<<< HEAD
-    "react": "canary",
-    "react-dom": "canary",
-=======
     "react": "latest",
     "react-dom": "latest",
->>>>>>> 11cb6b591571caf5fa2a192117b6a6445c3f2027
     "react-scripts": "latest",
     "toastify-js": "1.12.0"
   },

src/content/learn/reusing-logic-with-custom-hooks.md

@@ -840,7 +840,7 @@ Every time your `ChatRoom` component re-renders, it passes the latest `roomId` a
 <<<<<<< HEAD
 <Canary>
 
-**The `useEffectEvent` API is currently only available in React’s Canary and Experimental channels.** 
+**The `useEffectEvent` API is currently only available in React’s Canary and Experimental channels.**
 
 [Learn more about React’s release channels here.](/community/versioning-policy#all-release-channels)
 
@@ -1075,13 +1075,8 @@ export function showNotification(message, theme = 'dark') {
 ```json package.json hidden
 {
   "dependencies": {
-<<<<<<< HEAD
-    "react": "canary",
-    "react-dom": "canary",
-=======
     "react": "latest",
     "react-dom": "latest",
->>>>>>> 11cb6b591571caf5fa2a192117b6a6445c3f2027
     "react-scripts": "latest",
     "toastify-js": "1.12.0"
   },