diff --git a/01/01.txt b/01/01.txt
index 6ad446e..ed1cab9 100644
--- a/01/01.txt
+++ b/01/01.txt
@@ -1,7 +1 @@
-<<<<<<< HEAD
-\c 1 \v 1 Mu buku lakwamba nkhalemba Theophilusi,nkhayowoya vinthu vyose ivyo Yesu wakamba kuchita na kusambizga,
-\v 2 mupaka zuba ilo wakatolekela kuluta kuchanya,apo wakati wapereka langulo kupitila mwa mzimu mtuba kwa Bapositoli abo wakachema.
-\v 3 Pakujumpha visuzga vyake,wakajipoleka yekha wamoyo  kwa iye na ukabono unandi.Pa mazuba 40 wakawonekala kwaibo na kuyowoya za Ufumu wa Chiuta.
-=======
-\c 1 \v 1 Nkhani yakale iyo nkhalemba, Teyofilo, wakaphalila wose ivyo Yesu wakayamba kuchita nakusambizya, \v 2 kufikila pa siku ilo wakatoleka kuchanya, apo wakapa malamulo kupitila mumzimu mutiba  kubotumikila  awo wakasankha. \v 3 Kufuma pakusuzyika kwake, wakajipeleka wamoyo kwa iwo navimanyikwilo vinandi kwa masiku  makhumi yanai wakaonekelanga kwa iwo, ndipo wakayowoyanga za Ufumu wa Chiuta,
->>>>>>> cfa85e0703f962dc957a23b926193289270b638d
+\c 1 \v 1 Mu buku lakwamba nkhalemba Theophilusi,nkhayowoya vinthu vyose ivyo Yesu wakamba kuchita na kusambizga, \v 2 mupaka zuba ilo wakatolekela kuluta kuchanya,apo wakati wapereka langulo kupitila mwa mzimu mtuba kwa Bapositoli abo wakachema. \v 3 Pakujumpha visuzga vyake,wakajipoleka yekha wamoyo  kwa iye na ukabono unandi.Pa mazuba 40 wakawonekala kwaibo na kuyowoya za Ufumu wa Chiuta.
\ No newline at end of file