diff --git a/src/content/learn/preserving-and-resetting-state.md b/src/content/learn/preserving-and-resetting-state.md
index 713b27eab..e0de2178f 100644
--- a/src/content/learn/preserving-and-resetting-state.md
+++ b/src/content/learn/preserving-and-resetting-state.md
@@ -174,11 +174,7 @@ Memperbarui *state*
 </DiagramGroup>
 
 
-<<<<<<< HEAD
 React akan mempertahankan *state* selama Anda me-*render* komponen yang sama pada posisi yang sama. Untuk melihat hal ini, naikkan kedua penghitung, lalu hapus komponen kedua dengan menghapus centang pada *checkbox* "Render the second counter", lalu tambahkan kembali dengan mencentangnya lagi:
-=======
-React will keep the state around for as long as you render the same component at the same position in the tree. To see this, increment both counters, then remove the second component by unchecking "Render the second counter" checkbox, and then add it back by ticking it again:
->>>>>>> 97489434323b0c4cce78588cd0f48e3808e0eba4
 
 <Sandpack>
 
diff --git a/src/content/learn/rendering-lists.md b/src/content/learn/rendering-lists.md
index 3da3c55c1..a67294f4a 100644
--- a/src/content/learn/rendering-lists.md
+++ b/src/content/learn/rendering-lists.md
@@ -1258,11 +1258,7 @@ hr {
 
 </Sandpack>
 
-<<<<<<< HEAD
-Ingat, fragmen (biasa ditulis `<> </>`) memberi cara bagi Anda untuk menggabungkan beberapa *node* JSX tanpa perlu menambahkan `<div>` di bagian luar!
-=======
-Remember, Fragments (often written as `<> </>`) let you group JSX nodes without adding extra `<div>`s!
->>>>>>> 97489434323b0c4cce78588cd0f48e3808e0eba4
+Ingat, fragmen (biasa ditulis `<> </>`) memungkinkan Anda menggabungkan beberapa *node* JSX tanpa perlu menambahkan `<div>` di bagian luar!
 
 </Solution>