diff --git a/08/08.txt b/08/08.txt
index a6ec9ad..d063035 100644
--- a/08/08.txt
+++ b/08/08.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 8 Koma cakulya cutitwala lini kwa Mulungu. Tuipishiwalini ngati tikulyalini, kapena kunkhala abwino ngati tikulya. \v 9 Koma langishishani kuti mtendele wanu usankhale cokhumudwisha muyakine wamene asali olimba muchikhulupililo, \v 10 Lomba nbati muyakine aona mweo, muli naciziwisho,mukulya cakulya mu kacisi ya fano. Ko kufoka kwa cikumbu mtima cake kumulengeshelini kulya vopelekewa ku mafano?
-=======
-\v 8 Koma cakulya cutitwala lini kwa Mulungu. Nise batyalalini ngati tukulyalini, kapena kunkhala abwino ngati tukulya. \v 9 Koma onesheshani kuti mtendele wanu usankhale cokhumudwisha muyakine amene asali olimba mucikhulupililo. \v 10 Lomba ngati muyakine wakuona, uli na ciziwisho, ukulya cakulya mu kachisi ya mafano. Ko kufoka kwake mu cikumbumtima kumulengeshelini kulya vopelekewa ku mafano?
->>>>>>> fe15f7d9a478372dfeede69d7b6f723898a8b777
+\v 8 Koma cakulya cutitwala lini kwa Mulungu. Nise batyalalini ngati tukulyalini, kapena kunkhala abwino ngati tukulya. \v 9 Koma onesheshani kuti mtendele wanu usankhale cokhumudwisha muyakine amene asali olimba mucikhulupililo. \v 10 Lomba ngati muyakine wakuona, uli na ciziwisho, ukulya cakulya mu kachisi ya mafano. Ko kufoka kwake mu cikumbumtima kumulengeshelini kulya vopelekewa ku mafano?
\ No newline at end of file