diff --git a/src/content/learn/reusing-logic-with-custom-hooks.md b/src/content/learn/reusing-logic-with-custom-hooks.md
index 56455067a..82abb19ae 100644
--- a/src/content/learn/reusing-logic-with-custom-hooks.md
+++ b/src/content/learn/reusing-logic-with-custom-hooks.md
@@ -1898,11 +1898,7 @@ export default function Counter() {
 }
 ```
 
-<<<<<<< HEAD
-Anda perlu menulis custom Hook Anda di dalam file `useCounter.js` dan mengimpornya ke file `Counter.js`.
-=======
-You'll need to write your custom Hook in `useCounter.js` and import it into the `App.js` file.
->>>>>>> 2a2e02f1d88f4d2828728ce352626e84ed8abda0
+Anda perlu menulis custom Hook Anda di dalam file `useCounter.js` dan mengimpornya ke file `App.js`.
 
 <Sandpack>