Merge pull request #477 from yeeway0609/fix/incomplete-merge-fix

finish incomplete merge-conflict-fix in `/src/content/reference/react/useOptimistic`

Author: neighborhood999

src/content/reference/react/useOptimistic.md

@@ -27,11 +27,7 @@ The `useOptimistic` Hook is currently only available in React's Canary and exper
 
 ### `useOptimistic(state, updateFn)` {/*use*/}
 
-<<<<<<< HEAD
-`useOptimistic` is a React hook that lets you show a different state while an async action is underway. It accepts some state as an argument and returns a copy of that state that can be different during the duration of an async action such as a network request. You provide a function that takes the current state and the input to the action, and returns the optimistic state to be used while the action is pending.
-=======
 `useOptimistic` is a React Hook that lets you show a different state while an async action is underway. It accepts some state as an argument and returns a copy of that state that can be different during the duration of an async action such as a network request. You provide a function that takes the current state and the input to the action, and returns the optimistic state to be used while the action is pending.
->>>>>>> 4f9e9a56611c7a56b9506cf0a7ca84ab409824bc
 
 This state is called the "optimistic" state because it is usually used to immediately present the user with the result of performing an action, even though the action actually takes time to complete.