diff --git a/22/10.txt b/22/10.txt
index 542716a..9f27833 100644
--- a/22/10.txt
+++ b/22/10.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 10 Chati kwangu, ''Kanzi ubiki luswayo hamanzwi echi polofita cheyi imbuka, kakuti inako chi inahafui. \v 11 Iye ya shiyama, umusiye azwile habusu ni kutekunda zi sashiyeme. Iye yo tenda busangu bwizwile ikwe, musiye azwile habusu ni busangu bwekwe. Iye yo shiyeme, umusiye azwile habusu ni kutenda zishiyeme. Iye yo jolola, azwile habusu ni kujolola.''
-=======
-\v 10 Cha wamba kwangu, ''Sanzi upangi i nkunutu  manzwi a atanikizwe mweyi imbuka, inako ina hafuhi. \v 11 Iye yasa shiyeme. mumusiye azwile habusu nikupanga zisa shiyeme. Iye yopanga busangu bubi, mumusiye azwile habusu ni busangu bubi. Iye yo shiyeme, mumu siye azwile habusu niku tenda zishiyeme. Iye yo jolola, mumu siye azwile habusu niku jolola.''
->>>>>>> 9aca4ef08a3d29433eb898dccb0421655440f7c6
+\v 10 Cha wamba kwangu, ''Sanzi upangi i nkunutu  manzwi a atanikizwe mweyi imbuka, inako ina hafuhi. \v 11 Iye yasa shiyeme. mumusiye azwile habusu nikupanga zisa shiyeme. Iye yopanga busangu bubi, mumusiye azwile habusu ni busangu bubi. Iye yo shiyeme, mumu siye azwile habusu niku tenda zishiyeme. Iye yo jolola, mumu siye azwile habusu niku jolola.''
\ No newline at end of file