diff --git a/02/03.txt b/02/03.txt
index 367586e..5888751 100644
--- a/02/03.txt
+++ b/02/03.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 3 Na ñola muna ñolela njokuti kanzi ni chiswa kwavo vava kuswanela kuni tavisa. Nina insepo kuamana inwe muvonse kuti intavo yangu njiyona imukwete nenwe. \v 4 Linu niva miñoleli ni manyando makando, mi ninina mubukavo vwe nkulo, ni zinsozi zingi. kena ni vali kusaka kumi sasamisa. kono, nibali kusaka kuti mwizibe ilato likando lini kwete kwenu.
-=======
-\v 3 \v 4 Ni ñoli chakuti ni bechilili muku swanahalele kuti linu nize uko kwenu kuti kana ni sasamisi abo babali ku swanele kuni letela kusanga. Nina insepo kwenu mubonse kuti nisangite kwangu kuswana vulyo ni sanga kwenwu mwense kumu kwete. Kakuti ni ñola kwenu kakusaka bukando, kuzwilia mwinkulo, mi ni kazinsozi zingi. Kena ni bali kusaka ku misakiseza ku chiswa. Hakwina bulyo, ni bali kusaka kuti mwizibe chabutungi bwe lato lyangu lini kwete kwenu.
->>>>>>> 09a0a7953532d0a05f09aa36b02c07f2690f133d
+\v 3 Na ñola muna ñolela njokuti kanzi ni chiswa kwavo vava kuswanela kuni tavisa. Nina insepo kuamana inwe muvonse kuti intavo yangu njiyona imukwete nenwe. \v 4 Linu niva miñoleli ni manyando makando, mi ninina mubukavo vwe nkulo, ni zinsozi zingi. kena ni vali kusaka kumi sasamisa. kono, nibali kusaka kuti mwizibe ilato likando lini kwete kwenu.
\ No newline at end of file
diff --git a/02/05.txt b/02/05.txt
index 5bfa6a1..1f84324 100644
--- a/02/05.txt
+++ b/02/05.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 5 Haiba zumwi waleta kuchisa, kena leta bulyo kwangu,kono kamukwa umwi, noti kwi tula chabukali , kono waleta kwenu mwese . \v 6 Kuli kene uzo mutu hahewa Inkoto bulyo ku vantu bangi. \v 7 Lya hanu hasa muha ikoto, mwina noku swalela niku muomba-omba.  wina v,unjo nange ehaiwe vukando bwa maswavi akwe.
-=======
-\v 5 \v 6 \v 7 Chokuti heba kwina zumwi yabaleti ku sasamisa
->>>>>>> 09a0a7953532d0a05f09aa36b02c07f2690f133d
+\v 5 Haiba zumwi waleta kuchisa, kena leta bulyo kwangu,kono kamukwa umwi, noti kwi tula chabukali , kono waleta kwenu mwese . \v 6 Kuli kene uzo mutu hahewa Inkoto bulyo ku vantu bangi. \v 7 Lya hanu hasa muha ikoto, mwina noku swalela niku muomba-omba.  wina v,unjo nange ehaiwe vukando bwa maswavi akwe.
\ No newline at end of file
diff --git a/02/title.txt b/02/title.txt
index 5d0652e..a6a671d 100644
--- a/02/title.txt
+++ b/02/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Inkauhanyo 2
-=======
-Inkauhanyo ya 2
->>>>>>> 09a0a7953532d0a05f09aa36b02c07f2690f133d
+Inkauhanyo ya 2
\ No newline at end of file