diff --git a/02/06.txt b/02/06.txt
index 1485573..e849c23 100644
--- a/02/06.txt
+++ b/02/06.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 6 \v 7 Aiyao-aiyao hahani daimakon haim-haim wan wan ah kahane raora mahaimaken,One makotae Myao Kodon av Noho ni magidimakon,Noho Myao Kodon.
-=======
-\v 6 Sin bohos bae ene kahane Myao Kodon sin bae, ke agadifi, \v 7 ...
->>>>>>> d4aba27a8fa2ba5b840ee5dfb356176dda7d58d9
+\v 6 \v 7 Aiyao-aiyao hahani daimakon haim-haim wan wan ah kahane raora mahaimaken,One makotae Myao Kodon av Noho ni magidimakon,Noho Myao Kodon.
\ No newline at end of file