diff --git a/02/10.txt b/02/10.txt
index bc23433..2b6c3fa 100644
--- a/02/10.txt
+++ b/02/10.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 10 \v 11 Elyo Yawe akuba uwa kutinya kuli bo, ico konaula imilongu ma pano isonde uli onse aka mupepa umuntuonse mu calo cakwe, ku lulamba lonse ulwa nko.
-=======
-\v 11 \v 10 Ici icikacitika kuli Moabu na amoni pamulandu wa cilumba cabo ico balitukile nokuseka abantu ba kwa Yawe umwine wa Fita.
->>>>>>> 05f4af31f8dbe1e9f6426d0f62c67c3f55dd4265
+\v 11 \v 10 Ici icikacitika kuli Moabu na amoni pamulandu wa cilumba cabo ico balitukile nokuseka abantu ba kwa Yawe umwine wa Fita.
\ No newline at end of file