diff --git a/01/01.txt b/01/01.txt
index ee48532..8eb6796 100644
--- a/01/01.txt
+++ b/01/01.txt
@@ -1 +1,5 @@
-\c 1 \v 1 Bogologolo Modimo o ne a bua le badimo ba rona ka baporofiti ka dinako le ditsela tse dintsi. \v 2 Mme  mo malatsing a bofelo, Modimo o bua le rona ka morwa, yo a mo tlhomileng mojaboswa wa dilo tsotlhe.  Ke ka ene  gore Modimo gape a bo a dirile lobopo. \v 3 Ke ene lesedi la kgalalelo ya Modimo, setho sa modimo ka sebele. O tshwaraganya dilo tsotlhe ka maatla a lefoko la gagwe. Morago ga go tlhatswa dibe a  nna mo letsogong le legolo la yo mogolo.
\ No newline at end of file
+<<<<<<< HEAD
+\c 1 \v 1 Bogologolo Modimo o ne a bua le badimo ba rona ka baporofiti ka dinako le ditsela tse dintsi. \v 2 Mme  mo malatsing a bofelo, Modimo o bua le rona ka morwa, yo a mo tlhomileng mojaboswa wa dilo tsotlhe.  Ke ka ene  gore Modimo gape a bo a dirile lobopo. \v 3 Ke ene lesedi la kgalalelo ya Modimo, setho sa modimo ka sebele. O tshwaraganya dilo tsotlhe ka maatla a lefoko la gagwe. Morago ga go tlhatswa dibe a  nna mo letsogong le legolo la yo mogolo.
+=======
+\c 1 \v 1 Bogologolo Modimo o ne a bua le borrarona mogolo ka baporofiti ka dinako tse dintsi le ditsela tse dintsi. \v 2 Mme  mo malatsing ano a bofelo, Modimo o buile le rona ka Morwa, yo a mo tlhomileng mojaboswa wa dilo tsotlhe.  Ke ka ene  gore Modimo gape a bo a dirile lobopo. \v 3 Ke ene lesedi la kgalalelo ya Modimo, setho sa modimo ka sebele. O tshwaraganya dilo tsotlhe ka maatla a lefoko la gagwe. Morago ga go tlhatswa dibe a  nna mo letsogong le legolo la yo Mogolo kwa godimo.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/01/04.txt b/01/04.txt
index 157ff50..133334b 100644
--- a/01/04.txt
+++ b/01/04.txt
@@ -1 +1,5 @@
-\v 4 O nnile godimo go baengele, gonne leina le a le ruileng le legolo go na le la baengele.  \v 5 Ke mo go ofe wa baengele yo Modimo a mo reileng  a re o morwaake, gompieno ke tla nna rrago , Mme gape, ke tla nna rragwe, e tla nna morwaake?
\ No newline at end of file
+<<<<<<< HEAD
+\v 4 O nnile godimo go baengele, gonne leina le a le ruileng le legolo go na le la baengele.  \v 5 Ke mo go ofe wa baengele yo Modimo a mo reileng  a re o morwaake, gompieno ke tla nna rrago , Mme gape, ke tla nna rragwe, e tla nna morwaake?
+=======
+\v 4 O nnile godimo go baengele, gonne leina le a le ruileng le legolo go na le la bone. \v 5 Ke mo go ofe wa baengele yo Modimo a mo reileng  a re, "O morwaake, gompieno ke tla nna rrago" , Mme gape, "Ke tla nna rragwe, e tla nna morwaake"?
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/01/06.txt b/01/06.txt
index 65523ca..8e61a4c 100644
--- a/01/06.txt
+++ b/01/06.txt
@@ -1 +1,5 @@
-\v 6 Mme gape Modimo faa tlisa leitibilo mo lefatsheng, a re botlhe  baengele ba Modimo ba tla mo obamela. \v 7 Ka ga baengele a re, ke ene yoo dirang baegele ba gagwe mewa le batlhanka ba gagwe kgabo ya molelo.
\ No newline at end of file
+<<<<<<< HEAD
+\v 6 Mme gape Modimo faa tlisa leitibilo mo lefatsheng, a re botlhe  baengele ba Modimo ba tla mo obamela. \v 7 Ka ga baengele a re, ke ene yoo dirang baegele ba gagwe mewa le batlhanka ba gagwe kgabo ya molelo.
+=======
+\v 6 Mme gape Modimo fa a tsisa maitibilo mo lefatsheng, a re, "Botlhe  baengele ba Modimo ba tshwanetse go mo obamela." \v 7 Ka ga baengele a re, "Ke ene yo o dirang baengele ba gagwe mewa, le batlhanka ba gagwe kgabo ya molelo."
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/01/08.txt b/01/08.txt
index ea72038..3aadb46 100644
--- a/01/08.txt
+++ b/01/08.txt
@@ -1 +1,5 @@
-\v 8 Mme ka ga Morwa a re, torone ya gago,  Modimong ,e eme ka bosakhutleng. Lore lwa bogosi jwa gago ke lore lwa tshiamo. \v 9 O ratile tshiamo wa tlhoa tlhowa tlhoko molao , ka jalo Modimo, Modimo wa gago, o go tloditse ka leokwane la boipelo go feta bao nang nabo.
\ No newline at end of file
+<<<<<<< HEAD
+\v 8 Mme ka ga Morwa a re, torone ya gago,  Modimong ,e eme ka bosakhutleng. Lore lwa bogosi jwa gago ke lore lwa tshiamo. \v 9 O ratile tshiamo wa tlhoa tlhowa tlhoko molao , ka jalo Modimo, Modimo wa gago, o go tloditse ka leokwane la boipelo go feta bao nang nabo.
+=======
+\v 8 Mme ka ga Morwa a re, "Setilo sa gago sa bogosi,  Modimo ,se eme ka bosakhutleng. Lore lwa bogosi jwa gago ke lore lwa tshiamo. \v 9 O ratile tshiamo wa ila tlhoko molao. Ka jalo Modimo, Modimo wa gago, o go tloditse ka leokwane la boipelo go feta bao nang nabo."
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/01/10.txt b/01/10.txt
index fcaf3a2..6d04e7e 100644
--- a/01/10.txt
+++ b/01/10.txt
@@ -1 +1,5 @@
-\v 10 Mo tshimologong, Morena,  o ile wa thaya motheo wa lefatshe,  Magodimo ke tiro ya diatla tsa gago. \v 11 Ba tlaa nyelela mme wena o tla tswelela. Ba  tlaa onala jaaka sekgethe sa diaparo. \v 12 O tla ba phutha jaaka jase, mme ba tla fetoga go nna sekgethe sa diaparo. Mme wena o tshwana fela, dingwaga tsa gago ga di khutle.
\ No newline at end of file
+<<<<<<< HEAD
+\v 10 Mo tshimologong, Morena,  o ile wa thaya motheo wa lefatshe,  Magodimo ke tiro ya diatla tsa gago. \v 11 Ba tlaa nyelela mme wena o tla tswelela. Ba  tlaa onala jaaka sekgethe sa diaparo. \v 12 O tla ba phutha jaaka jase, mme ba tla fetoga go nna sekgethe sa diaparo. Mme wena o tshwana fela, dingwaga tsa gago ga di khutle.
+=======
+\v 10 Mo tshimologong, Morena,  o ile wa thaya motheo wa lefatshe. Magodimo ke tiro ya diatla tsa gago. \v 11 A tlaa nyelela mme wena o tla tswelela, a tla a onala jaaka sekgethe sa diaparo. \v 12 O tla a phutha jaaka jase, mme a tla fetoga go nna sekgethe sa diaparo. Mme wena o tshwana fela, dingwaga tsa gago ga di khutle."
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/01/13.txt b/01/13.txt
index 6d9700f..76ae1ad 100644
--- a/01/13.txt
+++ b/01/13.txt
@@ -1 +1,5 @@
-\v 13 Ke ofe wa baengele yo Modimo a neng a mo raya a re nna mo letsogong le legolo lame, go fitlhela ke  dira baba ba gago go nna bodulo ja dinao tsa gago. \v 14 A botlhe baengele gase mewa ee direlang , le ba ba rumilweng go tlhokomela ba ba tlaa ruang poloko?
\ No newline at end of file
+<<<<<<< HEAD
+\v 13 Ke ofe wa baengele yo Modimo a neng a mo raya a re nna mo letsogong le legolo lame, go fitlhela ke  dira baba ba gago go nna bodulo ja dinao tsa gago. \v 14 A botlhe baengele gase mewa ee direlang , le ba ba rumilweng go tlhokomela ba ba tlaa ruang poloko?
+=======
+\v 13 Ke ofe wa baengele yo Modimo a neng a mo raya a re, "Nna mo letsogong le legolo lame, go fitlhela ke  dira baba ba gago go nna bonno ja dinao tsa gago?"  \v 14 A botlhe baengele gase mewa e e direlang , le e e rumilweng go tlhokomela ba ba tlaa ruang poloko?
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/02/01.txt b/02/01.txt
index 59c9050..ec45c39 100644
--- a/02/01.txt
+++ b/02/01.txt
@@ -1 +1,5 @@
-\c 2 \v 1  Ka jalo re tshwanetse ra ela tlhoko thata tse re di utlwileng, gore re seka ra tswa mo go tsone.
\ No newline at end of file
+<<<<<<< HEAD
+\c 2 \v 1  Ka jalo re tshwanetse ra ela tlhoko thata tse re di utlwileng, gore re seka ra tswa mo go tsone.
+=======
+\v 1  Ka jalo re tshwanetse ra ela tlhoko thata tse re di utlwileng, gore re seka ra tswa mo go tsone.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/02/02.txt b/02/02.txt
index 6fd0986..41f83b8 100644
--- a/02/02.txt
+++ b/02/02.txt
@@ -1 +1,5 @@
-\v 2 Fa ele gore molaetsa yo o neng o builwe ka baengele o boammaaruri, tlolo molao le tlhoko kutlo nngwe le nngwe  e tlaa amogela kotlhao, \v 3 re ka falola jang fa re ikgatolosa poloko e kgolo e? Poloko ee builweng ke Morena e be ya tlhomamisiwa mo go rona ke ba ba e utlwileng. \v 4 Modimo o supa ka ditshupo le dikgakgamatso, le ditiro tse di maatla, le ka go aba dimpho tsa Semoya ka fa a ratang ka teng.
\ No newline at end of file
+<<<<<<< HEAD
+\v 2 Fa ele gore molaetsa yo o neng o builwe ka baengele o boammaaruri, tlolo molao le tlhoko kutlo nngwe le nngwe  e tlaa amogela kotlhao, \v 3 re ka falola jang fa re ikgatolosa poloko e kgolo e? Poloko ee builweng ke Morena e be ya tlhomamisiwa mo go rona ke ba ba e utlwileng. \v 4 Modimo o supa ka ditshupo le dikgakgamatso, le ditiro tse di maatla, le ka go aba dimpho tsa Semoya ka fa a ratang ka teng.
+=======
+\v 2 Fa ele gore molaetsa o o neng o builwe ka baengele o boammaaruri, tlolo molao le tlhoko kutlo nngwe le nngwe  e tla a amogela kotlhao, \v 3 re ka falola jang fa re ikgatholosa poloko e kgolo e? Poloko e ke e e builweng ke Morena e be ya tlhomamisiwa mo go rona ke ba ba e utlwileng. \v 4 Modimo o supile ka ditshupo le dikgakgamatso, le ditiro tse di maatla, le ka go aba dineo tsa Moya ka fa a ratang ka teng.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/02/05.txt b/02/05.txt
index 0bc2524..497e5a5 100644
--- a/02/05.txt
+++ b/02/05.txt
@@ -1 +1,5 @@
-\v 5 Ka gore gase ga baengele gore Modimo a ba atlholele lefatshe le le tlang, ka tse re di buang. \v 6 Le fa go ntse jalo, mongwe golo gongwe o buile, are, ''Ke motho ofe yo o akanyang ka ene? Kana morwa motho, yo le kgathalang ka ene?
\ No newline at end of file
+<<<<<<< HEAD
+\v 5 Ka gore gase ga baengele gore Modimo a ba atlholele lefatshe le le tlang, ka tse re di buang. \v 6 Le fa go ntse jalo, mongwe golo gongwe o buile, are, ''Ke motho ofe yo o akanyang ka ene? Kana morwa motho, yo le kgathalang ka ene?
+=======
+\v 5  Ga se baengele ba Modimo a ba neetseng taolo ya lefatshe le le tlang, ka tse re di buang. \v 6 Le fa go ntse jalo, mongwe golo gongwe o buile, are, '' Motho  ya bo e le mang, yo o akanyang ka ene? Kana morwa motho, yo o kgathalang ka ene?
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/02/07.txt b/02/07.txt
index f0e4bc6..9ee2828 100644
--- a/02/07.txt
+++ b/02/07.txt
@@ -1 +1,5 @@
-\v 7 O dirile motho a le ka fa tlase ga baengele; wa mo apesa ka kgalalelo le tlotlo. \v 8 O ne wa baya sengwe le sengwe ka fa tlase ga dinao tsa gagwe.'' Ka gore ke ene yo Modimo a beileng dilo tsotlhe ka fa tlase ga taolo ya gagwe. Ga gona sepe se a se tlogetseng. Mme jaanong gare ise re lemoge tseo tsotlhe tse di ka fa tlase ga taolo gagwe.
\ No newline at end of file
+<<<<<<< HEAD
+\v 7 O dirile motho a le ka fa tlase ga baengele; wa mo apesa ka kgalalelo le tlotlo. \v 8 O ne wa baya sengwe le sengwe ka fa tlase ga dinao tsa gagwe.'' Ka gore ke ene yo Modimo a beileng dilo tsotlhe ka fa tlase ga taolo ya gagwe. Ga gona sepe se a se tlogetseng. Mme jaanong gare ise re lemoge tseo tsotlhe tse di ka fa tlase ga taolo gagwe.
+=======
+\v 7 O dirile motho a le ka fa tlase ga baengele; wa mo apesa ka kgalalelo le tlotlo. \v 8 O ne wa baya sengwe le sengwe ka fa tlase ga dinao tsa gagwe.'' Ka gore ke ene yo Modimo a beileng dilo tsotlhe ka fa tlase ga taolo ya gagwe. Ga gona sepe se a se tlogetseng, se se ka fa tlase ga taolo ya gagwe. Mme jaanong gare ise re  bone tseo tsotlhe tse di ka fa tlase ga taolo gagwe.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/02/09.txt b/02/09.txt
index 871e4e9..5c2a65c 100644
--- a/02/09.txt
+++ b/02/09.txt
@@ -1 +1,5 @@
-\v 9 Mme re a bona gore yoo tlhomilweng ka fa tlase ga baengele ka nakwana: Jeso, yo, ka ntlha ya tshotlo le loso la gagwe, o apesitswe ka kgalalelo le tlotlo. Jaanong, ka tshegofatso ya Modimo, o re swetse rotlhe. \v 10 Gonne go ne go siametse Modimo, ka gore dilo tsotlhe di bonafalela ene ka ntlha ya gagwe, go tlisa barwa botlhe kgalalelong. Gone go siame go dira moeteledipele wa poloko ya bone ka pogisego ya gagwe.
\ No newline at end of file
+<<<<<<< HEAD
+\v 9 Mme re a bona gore yoo tlhomilweng ka fa tlase ga baengele ka nakwana: Jeso, yo, ka ntlha ya tshotlo le loso la gagwe, o apesitswe ka kgalalelo le tlotlo. Jaanong, ka tshegofatso ya Modimo, o re swetse rotlhe. \v 10 Gonne go ne go siametse Modimo, ka gore dilo tsotlhe di bonafalela ene ka ntlha ya gagwe, go tlisa barwa botlhe kgalalelong. Gone go siame go dira moeteledipele wa poloko ya bone ka pogisego ya gagwe.
+=======
+\v 9 Mme re a bona gore yo o dirilweng mmotlana mo baengeleng ka nakwana: Jeso, yo, ka ntlha ya tshotlego le loso la gagwe, o apesitswe ka kgalalelo le tlotlo. Jaanong, ka tshegofatso ya Modimo, o re swetse rotlhe. \v 10 Gonne go ne go siametse Modimo, ka gore dilo tsotlhe di teng ka ene le ka ntlha ya gagwe, go tsisa barwa botlhe kgalalelong. Gone go mo siametse go dirwa moeteledipele wa poloko ya bone ka tshotlego ya gagwe.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/02/11.txt b/02/11.txt
index 791ae0a..2170ec4 100644
--- a/02/11.txt
+++ b/02/11.txt
@@ -1 +1,5 @@
-\v 11 Ka gore botlhe ba ba itshepisang le ba ba itshepisitsweng ba na le motswedi ole mongwe. Ka jalo ga a tlhabiwe ke ditlhong go ba bitsa barwa rraagwe. \v 12 Are, ''ke tlaa bitsa leina la gago, ke tla a opela ka wena mo diphuthegong.''
\ No newline at end of file
+<<<<<<< HEAD
+\v 11 Ka gore botlhe ba ba itshepisang le ba ba itshepisitsweng ba na le motswedi ole mongwe. Ka jalo ga a tlhabiwe ke ditlhong go ba bitsa barwa rraagwe. \v 12 Are, ''ke tlaa bitsa leina la gago, ke tla a opela ka wena mo diphuthegong.''
+=======
+\v 11 Ka gore botlhe yo o itshepisang le ba ba itshepisitsweng ba na le motswedi o le mongwe. Ka jalo ga a tlhabiwe ke ditlhong go ba bitsa barwa rraagwe. \v 12 A re, ''Ke tlaa bolela leina la gago mo go barwarre, ke tla a opela ka wena mo diphuthegong.''
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/02/13.txt b/02/13.txt
index ebc1f7d..d97fc00 100644
--- a/02/13.txt
+++ b/02/13.txt
@@ -1 +1,5 @@
-\v 13 Mme gape, ''ke tla a mo tshepha.'' Mme gape, ''bona, ke fa le bana ba Modimo a mphileng bone.'' \v 14 Mme, ka bana ba Modimo ba kgaogana mmele le madi, Jeso le ene a kgaogana tse le bone, gore ka loso a fetse maatla a leso, a e leng, mmaba. \v 15 Se e ne e le go golola botlhe mo poifong ya loso le mo bokgobeng mo matshelong a bone.
\ No newline at end of file
+<<<<<<< HEAD
+\v 13 Mme gape, ''ke tla a mo tshepha.'' Mme gape, ''bona, ke fa le bana ba Modimo a mphileng bone.'' \v 14 Mme, ka bana ba Modimo ba kgaogana mmele le madi, Jeso le ene a kgaogana tse le bone, gore ka loso a fetse maatla a leso, a e leng, mmaba. \v 15 Se e ne e le go golola botlhe mo poifong ya loso le mo bokgobeng mo matshelong a bone.
+=======
+\v 13 Mme gape, ''ke tla a mo tshepa.'' Mme gape, ''Bona, ke fa le bana ba Modimo a mphileng bone.'' \v 14 Mme, ka bana ba Modimo ba kopanetse nama le madi, Jeso le ene a di kopanela le bone, gore ka loso a nyeletse ene yo o nang le maatla a loso, yo e leng saatane. \v 15 Se e ne e le gore a tle a golole ba ka poifo ya loso ba tshidileng matshelo a bone otlhe mo bokgobeng.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/02/16.txt b/02/16.txt
index fa21f1e..bac68d1 100644
--- a/02/16.txt
+++ b/02/16.txt
@@ -1 +1,5 @@
-\v 16 Ka gonne ga a tshwenyega ka baengele; mme o tshwenyegile ka peo ya ga Aborehame. \v 17 Go botlhokwa go tshwana le barwarraagwe ka tsela tsotlhe, gore o tla nna moperesita yoo mogolo yoo kutlwelo botlhoko le boikanyego mo dilong tsa Modimo,  gore a tle a ba itshwarele maleo a bone. \v 18 Ka gore Jeso ka sebele o sotlwile o a bo a raelwa, ka jalo o thusa ba ba mo thaelong.
\ No newline at end of file
+<<<<<<< HEAD
+\v 16 Ka gonne ga a tshwenyega ka baengele; mme o tshwenyegile ka peo ya ga Aborehame. \v 17 Go botlhokwa go tshwana le barwarraagwe ka tsela tsotlhe, gore o tla nna moperesita yoo mogolo yoo kutlwelo botlhoko le boikanyego mo dilong tsa Modimo,  gore a tle a ba itshwarele maleo a bone. \v 18 Ka gore Jeso ka sebele o sotlwile o a bo a raelwa, ka jalo o thusa ba ba mo thaelong.
+=======
+\v 16 Ka gonne ga a tshwenyega ka baengele; mme o tshwenyegile ka peo ya ga Aborehama. \v 17 Jalo, go ne go le botlhokwa gore a tshwane le barwarraagwe ka ditsela tsotlhe, gore a tle a nne moperesiti mogolo yo o kutlwelo botlhoko le boikanyego mo dilong tsa Modimo, le gore a tle a ba itshwarele maleo a batho. \v 18 Ka gore Jeso ka sebele o bogile a bo a raelwa, ka jalo o kgona go thusa ba ba mo thaelong.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/03/01.txt b/03/01.txt
index 90f4629..d115eb6 100644
--- a/03/01.txt
+++ b/03/01.txt
@@ -1 +1,5 @@
-\c 3 \v 1 Ka jalo bakaulengwe ba ba itshepileng, lo arogana pitso ya selegodimo. Akanyang ka Jeso, moaposetole le moporofiti mogolo wa boipolelo jwa rona. \v 2 O ne a ikanyega mo Modimong, yo a mo tlhomileng, fela jaaka Moshe a ne a ikanyega mo ntlong ya Modimo. \v 3 Gonne Jeso  o kailwe a tshwanetswe ke kgalalelo e kgolo go feta Moshe, go nne yoo agileng ntlo o nale tlotlo e kgolo go feta ntlo. \v 4 Gonne ntlo nngwe le nngwe e agilwe ke motho, mme yoo agileng dilo tsotlhe ke Modimo.
\ No newline at end of file
+<<<<<<< HEAD
+\c 3 \v 1 Ka jalo bakaulengwe ba ba itshepileng, lo arogana pitso ya selegodimo. Akanyang ka Jeso, moaposetole le moporofiti mogolo wa boipolelo jwa rona. \v 2 O ne a ikanyega mo Modimong, yo a mo tlhomileng, fela jaaka Moshe a ne a ikanyega mo ntlong ya Modimo. \v 3 Gonne Jeso  o kailwe a tshwanetswe ke kgalalelo e kgolo go feta Moshe, go nne yoo agileng ntlo o nale tlotlo e kgolo go feta ntlo. \v 4 Gonne ntlo nngwe le nngwe e agilwe ke motho, mme yoo agileng dilo tsotlhe ke Modimo.
+=======
+\c 3 \v 1 Ka jalo, bakaulengwe ba ba itshepileng, lo kopanetse pitso ya selegodimo. Akanyang ka Jeso, moaposetolo le moperesiti mogolo wa boipolelo jwa rona. \v 2 O ne a ikanyega mo Modimong, yo a mo tlhomileng, fela jaaka Moshe a ne a ikanyega mo ntlong ya Modimo. \v 3 Gonne Jeso  o kailwe a tshwanetswe ke kgalalelo e kgolo go feta Moshe, go nne yo o agileng ntlo o nale tlotlo e kgolo go feta ntlo. \v 4 Gonne ntlo nngwe le nngwe e agilwe ke motho, mme yo o agileng dilo tsotlhe ke Modimo.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/03/05.txt b/03/05.txt
index 2aad545..88d7c64 100644
--- a/03/05.txt
+++ b/03/05.txt
@@ -1 +1,5 @@
-\v 5 Ka ntlha e nngwe, Moshe o ne a ikanyega jaaka motlhanka mo ntlong ya Modimo. E ne ele mopaki ka dilo tsotlhe tse di tlaa diragalang mo nakong ee tlang. \v 6 Keresete ke morwa yoo mo taolong ya ntlo ya Modimo. Re  ntlo ya gagwe fa re tshwarelela mo kgothalong ya rona le mo tshepong e re ikgatlhang ka yone.
\ No newline at end of file
+<<<<<<< HEAD
+\v 5 Ka ntlha e nngwe, Moshe o ne a ikanyega jaaka motlhanka mo ntlong ya Modimo. E ne ele mopaki ka dilo tsotlhe tse di tlaa diragalang mo nakong ee tlang. \v 6 Keresete ke morwa yoo mo taolong ya ntlo ya Modimo. Re  ntlo ya gagwe fa re tshwarelela mo kgothalong ya rona le mo tshepong e re ikgatlhang ka yone.
+=======
+\v 5 Ka ntlha e nngwe, Moshe o ne a ikanyega jaaka motlhanka mo ntlong yotlhe ya Modimo. O ne a le bopaki ka dilo tsotlhe tse di tla a diragalang mo nakong e e tlang. \v 6 Keresete ke Morwa yo o mo taolong ya ntlo ya Modimo. Re  ntlo ya gagwe fa re tshwarelela mo kgothalong ya rona le mo tshepong e re ikgatlhang ka yone.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/03/07.txt b/03/07.txt
index a106146..1cc4e4d 100644
--- a/03/07.txt
+++ b/03/07.txt
@@ -1 +1,5 @@
-\v 7 Ka jalo, go ntse jaaka ka fa Moya o o boitshepo o buang ka teng o re," Gompieno, fa o utlwa lentswe la gagwe \v 8 lo seka lwa thatafatsa dipelo tsa lona jaaka diingaodi, mo nakong ya teko mo Sekakeng.
\ No newline at end of file
+<<<<<<< HEAD
+\v 7 Ka jalo, go ntse jaaka ka fa Moya o o boitshepo o buang ka teng o re," Gompieno, fa o utlwa lentswe la gagwe \v 8 lo seka lwa thatafatsa dipelo tsa lona jaaka diingaodi, mo nakong ya teko mo Sekakeng.
+=======
+\v 7 Ka jalo, go ntse fela jaaka Moya o o boitshepo o buang ka teng o re," Gompieno, fa le utlwa lentswe la gagwe \v 8 le seka la thatafatsa dipelo tsa lona mo boingaoding,jaaka nako ya teko mo Sekakeng.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/03/09.txt b/03/09.txt
index b49addf..cc32f36 100644
--- a/03/09.txt
+++ b/03/09.txt
@@ -1 +1,5 @@
-\v 9 Se e ne  e le fa badimo ba gago ba ingaola ka go nteka, le fa ba ntse ba bone ditiro tsame dingwaga di le masome mane. \v 10 Ka jalo, ke ne ka seka ka itumelela kokomane eo. Ke rile," ba latlhegile  mo dipelong tsa bone ka nako tsotlhe.' Ga ba ise ba ke ba itse ditsela tsame. \v 11 Go ntse jaaka ke ikana ka tenego yame ke re: ' Ga ba kitla ba tsena mo boitapolosong jwame."
\ No newline at end of file
+<<<<<<< HEAD
+\v 9 Se e ne  e le fa badimo ba gago ba ingaola ka go nteka, le fa ba ntse ba bone ditiro tsame dingwaga di le masome mane. \v 10 Ka jalo, ke ne ka seka ka itumelela kokomane eo. Ke rile," ba latlhegile  mo dipelong tsa bone ka nako tsotlhe.' Ga ba ise ba ke ba itse ditsela tsame. \v 11 Go ntse jaaka ke ikana ka tenego yame ke re: ' Ga ba kitla ba tsena mo boitapolosong jwame."
+=======
+\v 9 Se e ne  e le fa borralona mogolo ba ingaola ka go nteka, le fa ba ntse ba bone ditiro tsame dingwaga di le masome mane. \v 10 Ka jalo, ke ne ka seka ka itumelela kokomane eo. Ke rile," Ba latlhegile  mo dipelong tsa bone ka nako tsotlhe. Ga ba ise ba ke ba itse ditsela tsame." \v 11 Go ntse jaaka ke ikana ka tenego yame ke re: ' Ga ba kitla ba tsena mo boitapolosong jwame."
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/03/12.txt b/03/12.txt
index 5a8eda9..589e84a 100644
--- a/03/12.txt
+++ b/03/12.txt
@@ -1 +1,5 @@
-\v 12 Elang tlhoko bakaulengwe, gore go se nne ope wa lona yoo pelo e bosula ee sa dumeleng, ee huraletseng Modimo o o tshelang. \v 13 Le fa go ntse jalo, kgothatsanang "tsatsi le letsatsi," go santse go nale nako, " go re go se nne ope wa lona yoo thatafadiwang ka tsietsego ya boleo.
\ No newline at end of file
+<<<<<<< HEAD
+\v 12 Elang tlhoko bakaulengwe, gore go se nne ope wa lona yoo pelo e bosula ee sa dumeleng, ee huraletseng Modimo o o tshelang. \v 13 Le fa go ntse jalo, kgothatsanang "tsatsi le letsatsi," go santse go nale nako, " go re go se nne ope wa lona yoo thatafadiwang ka tsietsego ya boleo.
+=======
+\v 12 Elang tlhoko bakaulengwe, gore go se nne ope wa lona yo o pelo e bosula e e sa dumeleng, e e huraletseng Modimo yo o tshelang. \v 13 Le fa go ntse jalo, kgothatsanang "letsatsi le letsatsi," go santse go nale nako, " go re go se nne ope wa lona yo o thatafadiwang ka tsietsego ya boleo.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/03/14.txt b/03/14.txt
index 666a844..d92ddba 100644
--- a/03/14.txt
+++ b/03/14.txt
@@ -1 +1,5 @@
-\v 14 Ka gore re nnile batsaya karolo le Keresete fa re tshwarelela ka thata tshepo ya rona mo go ene go simolola kwa tshimologong go ya kwa bofelong. \v 15 Ka se go builwe gatwe, "Gompieno, fa le utlwa lentswe la gagwe, lo seka lwa thatafatsa dipelo tsa lona jaaka diingaodi."
\ No newline at end of file
+<<<<<<< HEAD
+\v 14 Ka gore re nnile batsaya karolo le Keresete fa re tshwarelela ka thata tshepo ya rona mo go ene go simolola kwa tshimologong go ya kwa bofelong. \v 15 Ka se go builwe gatwe, "Gompieno, fa le utlwa lentswe la gagwe, lo seka lwa thatafatsa dipelo tsa lona jaaka diingaodi."
+=======
+\v 14 Ka gore re nnile batsaya karolo le Keresete fa re tshwarelela ka thata tshepo ya rona mo go ene go simolola kwa tshimologong go ya kwa bofelong. \v 15 Ka se go builwe gatwe, "Gompieno, fa le utlwa lentswe la gagwe, le seka la thatafatsa dipelo tsa lona mo boingaoding."
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/03/16.txt b/03/16.txt
index 99920e6..be8f1af 100644
--- a/03/16.txt
+++ b/03/16.txt
@@ -1 +1,5 @@
-\v 16 Ke mang ene yoo utlwileng Modimo a bo a ingaola?A ga se ba ba neng ba tswa Egepeto  ka Moshe? \v 17 Bone baa neng a ba galefetse dingwaga tse di masome mane? A ga se bone ba ba neng ba leofile, ba ditopo tsa bone di wetseng mo sekakeng? \v 18 Ba a ikanneng gore ga ba kitla ba tsena mo boitapolosong, fa e ne e se ka ba ba mo tlhoketseng kutlo? \v 19 Re bona gore ba ne ba ka seke ba tsene mo boikhutsong ka lebaka la go tlhoka go dumela.
\ No newline at end of file
+<<<<<<< HEAD
+\v 16 Ke mang ene yoo utlwileng Modimo a bo a ingaola?A ga se ba ba neng ba tswa Egepeto  ka Moshe? \v 17 Bone baa neng a ba galefetse dingwaga tse di masome mane? A ga se bone ba ba neng ba leofile, ba ditopo tsa bone di wetseng mo sekakeng? \v 18 Ba a ikanneng gore ga ba kitla ba tsena mo boitapolosong, fa e ne e se ka ba ba mo tlhoketseng kutlo? \v 19 Re bona gore ba ne ba ka seke ba tsene mo boikhutsong ka lebaka la go tlhoka go dumela.
+=======
+\v 16 Ke mang ene yo o utlwileng Modimo a bo a ingaola?A ga se ba ba neng ba tswa Egepeto  ka Moshe? \v 17 Bone ba a neng a ba galefetse dingwaga tse di masome mane? A ga se bone ba ba neng ba leofile, ba ditopo tsa bone di wetseng mo sekakeng? \v 18 Ke bafe ba a ba ikanetseng gore ga ba kitla ba tsena mo boitapolosong, fa e ne e se ba ba mo tlhoketseng kutlo? \v 19 Re bona gore ba ne ba seka ba kgona go tsena mo boitapolosong ka lebaka la go tlhoka go dumela.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/03/title.txt b/03/title.txt
index 5d09504..6bf37ed 100644
--- a/03/title.txt
+++ b/03/title.txt
@@ -1 +1,5 @@
-Kgaolo ya boraro
\ No newline at end of file
+<<<<<<< HEAD
+Kgaolo ya boraro
+=======
+Kgaolo 3
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/04/01.txt b/04/01.txt
index 6251e73..624e23b 100644
--- a/04/01.txt
+++ b/04/01.txt
@@ -1 +1,5 @@
-\c 4 \v 1 Ka moo, a re nneng podimatseba gore go seka ga nna le ope wa lona yo go lebegang a ka seka a fitlhelela tshephiso e le e tlogeletsweng go tsena boitapoloso jwa Modimo. \v 2 Ka gore re ne re boleletswe dikgang tse di molemo fela jaaka di ne di ntse. Mme molaetsa o wa seka wa tswela mosola ba ba neng ba seka ba lomagana mo tumelong le ba ba neng ba nna kutlo.
\ No newline at end of file
+<<<<<<< HEAD
+\c 4 \v 1 Ka moo, a re nneng podimatseba gore go seka ga nna le ope wa lona yo go lebegang a ka seka a fitlhelela tshephiso e le e tlogeletsweng go tsena boitapoloso jwa Modimo. \v 2 Ka gore re ne re boleletswe dikgang tse di molemo fela jaaka di ne di ntse. Mme molaetsa o wa seka wa tswela mosola ba ba neng ba seka ba lomagana mo tumelong le ba ba neng ba nna kutlo.
+=======
+\c 4 \v 1 Ka jalo, a re nneng kelotlhoko gore go seka ga nna le ope wa lona yo go lebegang a ka seka a fitlhelela tsholofetso e le e tlogeletsweng go tsena mo boitapolosong jwa Modimo. \v 2 Ka gore re boleletswe dikgang tse di molemo fela jaaka bone. Mme molaetsa o wa seka wa tswela mosola ba ba neng ba seka ba lomagana mo tumelong le ba ba neng ba nna kutlo.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/04/03.txt b/04/03.txt
index f0733cc..d39acea 100644
--- a/04/03.txt
+++ b/04/03.txt
@@ -1 +1,5 @@
-\v 3 Ka gore rona ba re dumetseng ke rona ba re tla tsenang mo boitapolosong joo, fela jaaka a buile, "jaaka ke ikana mo tshakgalong yame, ga ba kitla ba tsena mo boitapolosong jwame. "Le fa go ntse jalo, ditiro tsa gagwe tse di bopilweng di ne tsa feleletswa ko motheong wa lefatshe. \v 4 Ka gore o buile golo gongwe ka letsatsi la bosupa, Modimo o ne a itapolosa ka letsatsi la bosupa go tswa mo ditirong tsotlhe tsa gagwe." \v 5 O buile gape a re, "ga ba kitla ba tsena mo boitapolosong jwame."
\ No newline at end of file
+<<<<<<< HEAD
+\v 3 Ka gore rona ba re dumetseng ke rona ba re tla tsenang mo boitapolosong joo, fela jaaka a buile, "jaaka ke ikana mo tshakgalong yame, ga ba kitla ba tsena mo boitapolosong jwame. "Le fa go ntse jalo, ditiro tsa gagwe tse di bopilweng di ne tsa feleletswa ko motheong wa lefatshe. \v 4 Ka gore o buile golo gongwe ka letsatsi la bosupa, Modimo o ne a itapolosa ka letsatsi la bosupa go tswa mo ditirong tsotlhe tsa gagwe." \v 5 O buile gape a re, "ga ba kitla ba tsena mo boitapolosong jwame."
+=======
+\v 3 Ka gore rona ba re dumetseng ke rona ba re tla tsenang mo boitapolosong joo, fela jaaka a buile, "jaaka ke ikana mo bogaleng jwame, ga ba kitla ba tsena mo boitapolosong jwame. "Le fa go ntse jalo, ditiro tsa gagwe tse di bopilweng di ne tsa feleletswa ko motheong wa lefatshe. \v 4 Ka gore o buile golo gongwe ka letsatsi la bosupa, "Modimo o ne a itapolosa ka letsatsi la bosupa go tswa mo ditirong tsotlhe tsa gagwe." \v 5 O buile gape a re, "Ga ba kitla ba tsena mo boitapolosong jwame."
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/04/06.txt b/04/06.txt
index f158a4d..2332a68 100644
--- a/04/06.txt
+++ b/04/06.txt
@@ -1 +1,5 @@
-\v 6 Ka jalo, ka gore go santse go kganetswe gore bangwe ba tsene mo boitapolosong ja gagwe, le ka gore bontsi jwa Baeseraele ba ba utlwileng mafoko a a molemo ga ba tsena ka lebaka la go tlhoka kutlo, \v 7 Modimo gape o tlhomile letsatsi lengwe le le bidiwang "gompieno." morago ga malatsi a le mantsi, a bua ka Tafita, jaaka go ne go sa tswa go buiwa, "gompieno fa o utwa lentswe la gagwe, le seka la thatahatsa dipelo tsa lona."
\ No newline at end of file
+<<<<<<< HEAD
+\v 6 Ka jalo, ka gore go santse go kganetswe gore bangwe ba tsene mo boitapolosong ja gagwe, le ka gore bontsi jwa Baeseraele ba ba utlwileng mafoko a a molemo ga ba tsena ka lebaka la go tlhoka kutlo, \v 7 Modimo gape o tlhomile letsatsi lengwe le le bidiwang "gompieno." morago ga malatsi a le mantsi, a bua ka Tafita, jaaka go ne go sa tswa go buiwa, "gompieno fa o utwa lentswe la gagwe, le seka la thatahatsa dipelo tsa lona."
+=======
+\v 6 Ka jalo, ka gore go santse go beetswe bangwe gore ba tsene mo boitapolosong ja gagwe, le ka gore bontsi jwa BaIseraele ba ba utlwileng mafoko a a molemo ga ba tsena ka lebaka la go tlhoka kutlo, \v 7 Modimo gape o tlhomile letsatsi lengwe le le bidiwang "Gompieno." Morago ga malatsi a le mantsi, a bua ka Tafita, jaaka go ne go sa tswa go buiwa, "Gompieno fa o utwa lentswe la gagwe, le seka la thatafatsa dipelo tsa lona."
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/04/08.txt b/04/08.txt
index c469c3f..5028c30 100644
--- a/04/08.txt
+++ b/04/08.txt
@@ -1 +1,5 @@
-\v 8 Ka gore fa ele gore Joshua o ba file boitapoloso, Modimo o ka bo a sa bua ka letsatsi le lengwe. \v 9 Ka moo go santse go na le letsatsi la Sabata le le beetsweng batho ba Modimo. \v 10 Ka gore yo o tsenang mo boitapolosong jwa Modimo o setse a itapolositse mo ditirong tsa gagwe, fela jaaka Modimo a dirile go tswa mo go tsa gagwe. \v 11 Ka jalo a re eletseng go tsena mo boitapolosong joo, gore go sena ope yo o tla dirang botlhoka kutlo jo ba bo dirileng.
\ No newline at end of file
+<<<<<<< HEAD
+\v 8 Ka gore fa ele gore Joshua o ba file boitapoloso, Modimo o ka bo a sa bua ka letsatsi le lengwe. \v 9 Ka moo go santse go na le letsatsi la Sabata le le beetsweng batho ba Modimo. \v 10 Ka gore yo o tsenang mo boitapolosong jwa Modimo o setse a itapolositse mo ditirong tsa gagwe, fela jaaka Modimo a dirile go tswa mo go tsa gagwe. \v 11 Ka jalo a re eletseng go tsena mo boitapolosong joo, gore go sena ope yo o tla dirang botlhoka kutlo jo ba bo dirileng.
+=======
+\v 8 Ka gore fa e le gore Joshua o ba file boitapoloso, Modimo o ka bo a sa bua ka letsatsi le lengwe. \v 9 Ka jalo go santse go na le letsatsi la Sabata le le beetsweng batho ba Modimo. \v 10 Ka gore yo o tsenang mo boitapolosong jwa Modimo o setse a itapolositse mo ditirong tsa gagwe, fela jaaka Modimo a dirile go tswa mo go tsa gagwe. \v 11 Ka jalo a re eletseng go tsena mo boitapolosong joo, gore go se nne ope yo o tla dirang botlhoka kutlo jo ba bo dirileng.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/04/12.txt b/04/12.txt
index fd0ad8d..4ade56f 100644
--- a/04/12.txt
+++ b/04/12.txt
@@ -1 +1,5 @@
-\v 12 Ka gore lefoko la Modimo le a tshela ebile le a dira, ebile le bogale go feta tshaka e e magale mabedi. Le phunyeletsa le tlhaba go kgaoganya botshelo le mowa, le ditokololo le moko. Le kgona go itse dikakanyo le maikaelelo a pelo. \v 13 Ga gona sepe se se bopilweng se se fitlhegileng fa pele ga Modimo. Le fa go ntse jalo, sengwe le sengwe se bulegile fa pele ga matlho a ene yo re tshwanetseng go arabela ko go ene.
\ No newline at end of file
+<<<<<<< HEAD
+\v 12 Ka gore lefoko la Modimo le a tshela ebile le a dira, ebile le bogale go feta tshaka e e magale mabedi. Le phunyeletsa le tlhaba go kgaoganya botshelo le mowa, le ditokololo le moko. Le kgona go itse dikakanyo le maikaelelo a pelo. \v 13 Ga gona sepe se se bopilweng se se fitlhegileng fa pele ga Modimo. Le fa go ntse jalo, sengwe le sengwe se bulegile fa pele ga matlho a ene yo re tshwanetseng go arabela ko go ene.
+=======
+\v 12 Ka gore lefoko la Modimo le a tshela ebile le a dira, le bogale go feta tshaka e e magale mabedi. Le phunyeletsa le tlhabe go kgaoganya maikutlo le moya, le ditokololo le moko. Le kgona go itse dikakanyo le maikaelelo a pelo. \v 13 Ga gona sepe se se bopilweng se se fitlhegileng fa pele ga Modimo. Le fa go ntse jalo, sengwe le sengwe se bulegile fa pele ga matlho a ene yo re tshwanetseng go arabela ko go ene.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/04/14.txt b/04/14.txt
index 343d48e..5283e20 100644
--- a/04/14.txt
+++ b/04/14.txt
@@ -1 +1,5 @@
-\v 14 Ka jalo, e re ka re na le moperesita yo mogolo yo o fitileng fa ga re ga magodimo, Jeso morwa Modimo, a re tshwareleleng ka thata ditumelo tsa rona. \v 15 Ka gore ga re na Moperesita mogolo yo o ka re utlwelang botlhoko ka makoa a rona. Le fa go ntse jalo, re na le mongwe yo o lekilweng ka ditsela tsotlhe fela jaaka re lekwa, ko ntleng fela ga gore ga a na sebe. \v 16 A re tsamaeng ka matlhagatlhaga ko toroneng ya tshegofatso, gore re kgone go amogela maitlwelobotlhoko le tshegofatso go thusa ka nako ya botlhoki.
\ No newline at end of file
+<<<<<<< HEAD
+\v 14 Ka jalo, e re ka re na le moperesita yo mogolo yo o fitileng fa ga re ga magodimo, Jeso morwa Modimo, a re tshwareleleng ka thata ditumelo tsa rona. \v 15 Ka gore ga re na Moperesita mogolo yo o ka re utlwelang botlhoko ka makoa a rona. Le fa go ntse jalo, re na le mongwe yo o lekilweng ka ditsela tsotlhe fela jaaka re lekwa, ko ntleng fela ga gore ga a na sebe. \v 16 A re tsamaeng ka matlhagatlhaga ko toroneng ya tshegofatso, gore re kgone go amogela maitlwelobotlhoko le tshegofatso go thusa ka nako ya botlhoki.
+=======
+\v 14 Ka jalo, e re ka re na le moperesiti yo mogolo yo o fetileng fa gare ga magodimo, Jeso Morwa Modimo, a re tshwareleleng ka thata tumelo ya rona. \v 15 Ka gore re na Moperesiti mogolo yo o ka re utlwelang botlhoko mo makoeng a rona. Le fa go ntse jalo, re na le mongwe yo o lekilweng ka ditsela tsotlhe fela jaaka re lekwa, ko ntleng fela ga gore ga a na sebe. \v 16 A re tsamaeng ka botlhokapoifo ko setilong sa bogosi sa tshegofatso, gore re kgone go amogela mautlwelobotlhoko le tshegofatso go re thusa ka nako ya botlhoki.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/05/01.txt b/05/01.txt
index 410268a..10dc513 100644
--- a/05/01.txt
+++ b/05/01.txt
@@ -1 +1,5 @@
-\c 5 \v 1 Moperesita mogolo mongwe le mongwe yo o tlhophilweng mo gare ga batho, o tlhomiwa go direla mo boemong jwa batho mo dilong tsotlhe tse di amanang le Modimo, gore a tle a ntshe dimpho le ditlhabelo tsa maleo. \v 2 O ka dirisana bonolo le ba ba itlhokomolosang le digogela thoko ka gore le ene o dikologilwe ke bokoa. \v 3 Ka ntlha ya se, go tlhokagala gore le ene a ntshe ditlhabelo tsa maleo a gagwe, fela jaaka a dira ka maleo a batho.
\ No newline at end of file
+<<<<<<< HEAD
+\c 5 \v 1 Moperesita mogolo mongwe le mongwe yo o tlhophilweng mo gare ga batho, o tlhomiwa go direla mo boemong jwa batho mo dilong tsotlhe tse di amanang le Modimo, gore a tle a ntshe dimpho le ditlhabelo tsa maleo. \v 2 O ka dirisana bonolo le ba ba itlhokomolosang le digogela thoko ka gore le ene o dikologilwe ke bokoa. \v 3 Ka ntlha ya se, go tlhokagala gore le ene a ntshe ditlhabelo tsa maleo a gagwe, fela jaaka a dira ka maleo a batho.
+=======
+\c 5 \v 1 Moperesiti mogolo mongwe le mongwe yo o tlhophilweng mo gare ga batho, o tlhomiwa go direla mo boemong jwa batho mo dilong tsotlhe tse di amanang le Modimo, gore a tle a ntshe dimpho le ditlhabelo tsa maleo. \v 2 O ka dirisana bonolo le ba ba senang kitso le digogela thoko ka gore le ene o dikologilwe ke bokoa. \v 3 Ka ntlha ya se, go tlhokafala gore le ene a ntshe ditlhabelo tsa maleo a gagwe, fela jaaka a dira ka maleo a batho.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/05/04.txt b/05/04.txt
index d20ecf7..8c471c8 100644
--- a/05/04.txt
+++ b/05/04.txt
@@ -1 +1,5 @@
-\v 4 Ga se ka ntlha ya gagwe gore mang le mang a tseye tlotla e. Le fa go ntse jalo, o biditswe ke Modimo fela jaaka Arone. \v 5 Ka tsela e tshwanang, le Keresete ga a itlotla ka go itira moperesita mogolo. Le fa go ntse jalo,yo a neng a bua le ene o ne a re "o Morwaake;gompieno ke nnile Rrago."
\ No newline at end of file
+<<<<<<< HEAD
+\v 4 Ga se ka ntlha ya gagwe gore mang le mang a tseye tlotla e. Le fa go ntse jalo, o biditswe ke Modimo fela jaaka Arone. \v 5 Ka tsela e tshwanang, le Keresete ga a itlotla ka go itira moperesita mogolo. Le fa go ntse jalo,yo a neng a bua le ene o ne a re "o Morwaake;gompieno ke nnile Rrago."
+=======
+\v 4 Ga se ka ntlha ya gagwe gore mang le mang a tseye tlotla e. Le fa go ntse jalo, o biditswe ke Modimo fela jaaka Arone. \v 5 Ka tsela e tshwanang, le Keresete ga a itlotla ka go itira moperesiti mogolo. Boemong ba moo,yo a neng a bua le ene o ne a re "O Morwaake; gompieno ke nnile Rrago."
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/05/06.txt b/05/06.txt
index fc2b158..1296173 100644
--- a/05/06.txt
+++ b/05/06.txt
@@ -1 +1,5 @@
-\v 6 Go tshwana fela le jaaka a bua gape gore, "O moperesita go ya bosakhutleng mo tsamaisong ya ga Melchizedek."
\ No newline at end of file
+<<<<<<< HEAD
+\v 6 Go tshwana fela le jaaka a bua gape gore, "O moperesita go ya bosakhutleng mo tsamaisong ya ga Melchizedek."
+=======
+\v 6 Go tshwana fela le jaaka a bua gape a re, "O moperesiti go ya bosakhutleng mo tsamaisong ya ga Melekisedeke."
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/05/07.txt b/05/07.txt
index 52ff311..4c01eda 100644
--- a/05/07.txt
+++ b/05/07.txt
@@ -1 +1,5 @@
-\v 7 Ka matsatsi a fa a le mo senameng, Keresete o ne a isa dithapelo le dikopo ka selelo se se ko godimo ko Modimong, Ene o kgonang go mmoloka mo losong. O ne a reediwa ka ntlha ya tebego ya tshiamo ya gagwe. \v 8 Le fa e ne e le morwa, O ne a ithuta kutlo mo dilong tse a di bogileng.
\ No newline at end of file
+<<<<<<< HEAD
+\v 7 Ka matsatsi a fa a le mo senameng, Keresete o ne a isa dithapelo le dikopo ka selelo se se ko godimo ko Modimong, Ene o kgonang go mmoloka mo losong. O ne a reediwa ka ntlha ya tebego ya tshiamo ya gagwe. \v 8 Le fa e ne e le morwa, O ne a ithuta kutlo mo dilong tse a di bogileng.
+=======
+\v 7 Ka matsatsi a fa a le mo senameng, Keresete o ne a isa dithapelo le dikopo ka selelo se se ko godimo kwa Modimong, Ene yo o kgonang go mmoloka mo losong. O ne a reediwa ka ntlha ya tshiamo ya gagwe. \v 8 Le fa e ne e le Morwa, o ne a ithuta kutlo mo dilong tse a di bogileng.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/05/09.txt b/05/09.txt
index cb81db2..524d0df 100644
--- a/05/09.txt
+++ b/05/09.txt
@@ -1 +1,5 @@
-\v 9 O ne a siamisiwa mme a nna poloko ya bosakhutleng mo mongwe le mongwe yo o mo obamelang. \v 10 O ne a tlhomiwa ke Modimo jaaka moperesita mogolo mo tsamaisong ya ga Melchizedek. \v 11 Go gontsi mo re ka go buang ka Jeso, mme go thata go tlhalosa ka le itlhokomolositse.
\ No newline at end of file
+<<<<<<< HEAD
+\v 9 O ne a siamisiwa mme a nna poloko ya bosakhutleng mo mongwe le mongwe yo o mo obamelang. \v 10 O ne a tlhomiwa ke Modimo jaaka moperesita mogolo mo tsamaisong ya ga Melchizedek. \v 11 Go gontsi mo re ka go buang ka Jeso, mme go thata go tlhalosa ka le itlhokomolositse.
+=======
+\v 9 O ne a siamisiwa mme a nna poloko ya bosakhutleng mo go mongwe le mongwe yo o mo utlwang. \v 10 O ne a tewa ke Modimo go nna moperesiti mogolo mo tsamaisong ya ga Melekiseteke. \v 11 Go gontsi mo re ka go buang ka Jeso, mme go thata go tlhalosa ka le sa batle go utlwa.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/05/12.txt b/05/12.txt
index ad0134a..d55d854 100644
--- a/05/12.txt
+++ b/05/12.txt
@@ -1 +1,5 @@
-\v 12 Ka nako e le ka bo le le baruti, le santse le na le letlhoko la mongwe yo o ka le rutang molao wa molaetsa ya Modimo. Le tlhoka masi eseng dijo tse di thata. \v 13 Ka go nne mongwe le mongwe yo o nwang masi ga a na botsipa jwa molaetsa wa tshiamo, ka gore e santse e le ngwana. \v 14 Mme dijo tse di thata ke tsa bagolo. Ba ke ba ka ntlha ya kgolo ya bone ba katisitseng go tlhaloganya pharologanyo ya bomolemo le bosula.
\ No newline at end of file
+<<<<<<< HEAD
+\v 12 Ka nako e le ka bo le le baruti, le santse le na le letlhoko la mongwe yo o ka le rutang molao wa molaetsa ya Modimo. Le tlhoka masi eseng dijo tse di thata. \v 13 Ka go nne mongwe le mongwe yo o nwang masi ga a na botsipa jwa molaetsa wa tshiamo, ka gore e santse e le ngwana. \v 14 Mme dijo tse di thata ke tsa bagolo. Ba ke ba ka ntlha ya kgolo ya bone ba katisitseng go tlhaloganya pharologanyo ya bomolemo le bosula.
+=======
+\v 12 Le fa ka nako e le ka bo le le barutintshi, le santse le letlhoka mongwe yo o ka le rutang dithuto tsa ntlha tsa molaetsa wa Modimo. Le tlhoka masi e seng dijo tse di thata. \v 13 Ka go nne mongwe le mongwe yo o nwang masi ga a na boitemogelo jwa molaetsa wa tshiamo, ka gore o santse a le ngwana. \v 14 Mme dijo tse di thata ke tsa bagolo. Ba ke ba ka ntlha ya kgolo ya bone ba katisitseng go tlhaloganya pharologanyo ya bomolemo le bosula.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/06/01.txt b/06/01.txt
index b18dce0..8de79e1 100644
--- a/06/01.txt
+++ b/06/01.txt
@@ -1 +1,5 @@
-\c 6 \v 1 Jalo, a re tlogeleng tshimologo ya molaetsa wa ga Keresete mme re ye ko kgolong. A re seka ra baya gape motheo wa ikotlhao mo ditirong tse di suleng le wa tumelo mo Modimong, \v 2 kana motheo wa go ruta ka dikolobetso, go baya diatla, tsogo ya baswi le katlholo ya bosakhutleng. \v 3 Re tlaa dira se fa Modimo a letlelela.
\ No newline at end of file
+<<<<<<< HEAD
+\c 6 \v 1 Jalo, a re tlogeleng tshimologo ya molaetsa wa ga Keresete mme re ye ko kgolong. A re seka ra baya gape motheo wa ikotlhao mo ditirong tse di suleng le wa tumelo mo Modimong, \v 2 kana motheo wa go ruta ka dikolobetso, go baya diatla, tsogo ya baswi le katlholo ya bosakhutleng. \v 3 Re tlaa dira se fa Modimo a letlelela.
+=======
+\c 6 \v 1 Jalo, a re tlogeleng tshimologo ya molaetsa wa ga Keresete mme re ye ko pele go gola. A re seka ra baya gape motheo wa go ikotlhaya mo ditirong tse di suleng le wa tumelo mo Modimong, \v 2 kana motheo wa go ruta ka dikolobetso, go baya diatla, tsogo ya baswi le katlholo ya bosakhutleng. \v 3 Re tlaa dira se fa Modimo a letlelela.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/06/04.txt b/06/04.txt
index 6b6c454..124bc3e 100644
--- a/06/04.txt
+++ b/06/04.txt
@@ -1 +1,5 @@
-\v 4 Ka gago kgonagale mogo bao ba kileng ba bona lesedi, ba utlwile mpho ya selegodimo ebile ba amogane Mowa yo o Boitshepo, \v 5 le bao ba ba utlwileng lefoko le le molemo la Modimo le maatla a nako tse di tlang, \v 6 bao ba kgelogileng-ga go kgonagale go ba busetsa gape ko boikotlhaong. Se ke ka ntlha ya gore ba ipapolela morwa Modimo gape, ba bo ba mo tlhabisa ditlhong mo setshabeng.
\ No newline at end of file
+<<<<<<< HEAD
+\v 4 Ka gago kgonagale mogo bao ba kileng ba bona lesedi, ba utlwile mpho ya selegodimo ebile ba amogane Mowa yo o Boitshepo, \v 5 le bao ba ba utlwileng lefoko le le molemo la Modimo le maatla a nako tse di tlang, \v 6 bao ba kgelogileng-ga go kgonagale go ba busetsa gape ko boikotlhaong. Se ke ka ntlha ya gore ba ipapolela morwa Modimo gape, ba bo ba mo tlhabisa ditlhong mo setshabeng.
+=======
+\v 4 Ka gago kgonagale mogo bao ba kileng ba bona lesedi, ba utlwile mpho ya selegodimo ebile ba amogane Moya o o Boitshepo, \v 5 le bao ba ba utlwileng lefoko le le molemo la Modimo le maatla a nako tse di tlang, \v 6 bao ba kgelogileng-ga go kgonagale go ba busetsa gape ko boikotlhaong. Se ke ka ntlha ya gore ba ipapolela Morwa Modimo gape, ba bo ba mo tlhabisa ditlhong mo setshabeng.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/06/07.txt b/06/07.txt
index 39eefe5..5cd084c 100644
--- a/06/07.txt
+++ b/06/07.txt
@@ -1 +1,5 @@
-\v 7 Lefatshe le le nwang metsi a pula e e tshologelang mo go lone, ebile le ntsha dijwalo tse di mosola mo go ba ba le berekang ke lone le segofadiwang ke Modimo. \v 8 Mme fa le tlhoga mitlwa, ga le na mosola mme le gaufi le phutso. Bokhutlo jwa lone ke go sa.
\ No newline at end of file
+<<<<<<< HEAD
+\v 7 Lefatshe le le nwang metsi a pula e e tshologelang mo go lone, ebile le ntsha dijwalo tse di mosola mo go ba ba le berekang ke lone le segofadiwang ke Modimo. \v 8 Mme fa le tlhoga mitlwa, ga le na mosola mme le gaufi le phutso. Bokhutlo jwa lone ke go sa.
+=======
+\v 7 Lefatshe le le nwang metsi a pula e e tshologelang mo go lone, ebile le ntsha dijwalo tse di mosola mo go ba ba le berekang ke lone le segofadiwang ke Modimo. \v 8 Mme fa le tlhoga mitlwa, ga le na mosola mme le gaufi le phutso. Bokhutlo jwa lone ke go sha.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/06/11.txt b/06/11.txt
index 3ca449a..82c5a58 100644
--- a/06/11.txt
+++ b/06/11.txt
@@ -1 +1,5 @@
-\v 11 Re eletsa thata gore mongwe le mongwe wa lona a supe bonatla go ya ko phelelong ka lebaka la thurihatso e e tletseng ya go itshepa. \v 12 Se ke ka gore lo seka la nna ditshwakga, mme baetsi ba ka tumelo le bopelotelele ba jang boswa jwa ditsholofetso.
\ No newline at end of file
+<<<<<<< HEAD
+\v 11 Re eletsa thata gore mongwe le mongwe wa lona a supe bonatla go ya ko phelelong ka lebaka la thurihatso e e tletseng ya go itshepa. \v 12 Se ke ka gore lo seka la nna ditshwakga, mme baetsi ba ka tumelo le bopelotelele ba jang boswa jwa ditsholofetso.
+=======
+\v 11 Re eletsa thata gore mongwe le mongwe wa lona a supe bonatla go ya ko phelelong ka lebaka la thurifatso e e tletseng ya botlhokapoifo. \v 12 Se ke ka gore lo seka la nna ditshwakga, mme le nne baetsi ba bao ka tumelo le bopelotelele ba jang boswa jwa ditsholofetso.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/06/13.txt b/06/13.txt
index be695cf..01735b1 100644
--- a/06/13.txt
+++ b/06/13.txt
@@ -1 +1,5 @@
-\v 13 Gonne fa Modimo a ne a dira tsholofetso ya gagwe ko go Aborehame, o ikannne ka ene ka a ne a ka se ikane ka ope yo mogolo go ene. \v 14 O rile "ke tlile go go segofatsa e le ruri ebile ke tla go godisa mo go golo." \v 15 Ka tsela e e ntseng jalo, Aborehame o ne a amogela se a se solofeditsweng morago ga go leta ka bopelotelele.
\ No newline at end of file
+<<<<<<< HEAD
+\v 13 Gonne fa Modimo a ne a dira tsholofetso ya gagwe ko go Aborehame, o ikannne ka ene ka a ne a ka se ikane ka ope yo mogolo go ene. \v 14 O rile "ke tlile go go segofatsa e le ruri ebile ke tla go godisa mo go golo." \v 15 Ka tsela e e ntseng jalo, Aborehame o ne a amogela se a se solofeditsweng morago ga go leta ka bopelotelele.
+=======
+\v 13 Gonne fa Modimo a ne a dira tsholofetso ya gagwe ko go Aborehama, o ikannne ka ene ka a ne a ka se ikane ka ope yo mogolo go ene. \v 14 O rile "Ke tsile go go segofatsa e le ruri ebile ke tla go godisa mo go golo." \v 15 Ka tsela e e ntseng jalo, Aborehama o ne a amogela se a se solofeditsweng morago ga go leta ka bopelotelele.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/06/16.txt b/06/16.txt
index d0f31ed..98fdfd1 100644
--- a/06/16.txt
+++ b/06/16.txt
@@ -1 +1,5 @@
-\v 16 Gonne batho ba ikana ka mongwe yo mogolo mo  go bone. Ko bokhutlong jwa ngangisano nngwe le nngwe, maikano e nna thurifatso. \v 17 Fa Modimo a ne a tsaya tshwetso ya go supegetsa go sa fetogeng ga boleng jwa maikaelelo a gagwe mo bajabosweng ba tsholofetso,o tlhomamisitse ka maikano a gagwe. \v 18 O dirile se ka ntlha ya gore dilo tse pedi tse di sa fetogeng, tse eleng gore ga go kgonagale gore Modimo a ake,rona ba re siileng go ya botshabelong, re tla nna le kgothatso e e masetla go tshegetsa ka thata tshepo e re e beilweng pele.
\ No newline at end of file
+<<<<<<< HEAD
+\v 16 Gonne batho ba ikana ka mongwe yo mogolo mo  go bone. Ko bokhutlong jwa ngangisano nngwe le nngwe, maikano e nna thurifatso. \v 17 Fa Modimo a ne a tsaya tshwetso ya go supegetsa go sa fetogeng ga boleng jwa maikaelelo a gagwe mo bajabosweng ba tsholofetso,o tlhomamisitse ka maikano a gagwe. \v 18 O dirile se ka ntlha ya gore dilo tse pedi tse di sa fetogeng, tse eleng gore ga go kgonagale gore Modimo a ake,rona ba re siileng go ya botshabelong, re tla nna le kgothatso e e masetla go tshegetsa ka thata tshepo e re e beilweng pele.
+=======
+\v 16 Gonne batho ba ikana ka mongwe yo mogolo mo  go bone. Ko bokhutlong jwa kganetsanyo nngwe le nngwe, maikano e nna thurifatso. \v 17 Fa Modimo a ne a tsaya tshwetso ya go supegetsa go sa fetogeng ga boleng jwa maikaelelo a gagwe mo bajabosweng ba tsholofetso,o tlhomamisitse ka maikano a gagwe. \v 18 O dirile se ka ntlha ya gore dilo tse pedi tse di sa fetogeng, tse eleng gore ga go kgonagale gore Modimo a ake,rona ba re siileng go ya botshabelong, re tla nna le kgothatso e e mashetla go tshegetsa ka thata tshepo e re e beilweng pele.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/06/19.txt b/06/19.txt
index 086cf37..fc158af 100644
--- a/06/19.txt
+++ b/06/19.txt
@@ -1 +1,5 @@
-\v 19 Re nale tshepo ele tshireletso e e tlhomameng ya mewa ya rona, tshepo e e tsenang mo felong le le  boitshepo ka fa morago ga sesiro. \v 20 Jeso o tsene mo felong leo e le morongwa, o nnile moperesita mogolo go ya bosakhutleng mo tsamaisong ya ga  Melchizedek.
\ No newline at end of file
+<<<<<<< HEAD
+\v 19 Re nale tshepo ele tshireletso e e tlhomameng ya mewa ya rona, tshepo e e tsenang mo felong le le  boitshepo ka fa morago ga sesiro. \v 20 Jeso o tsene mo felong leo e le morongwa, o nnile moperesita mogolo go ya bosakhutleng mo tsamaisong ya ga  Melchizedek.
+=======
+\v 19 Re nale tshepo ele tshireletso e e tlhomameng ya mewa ya rona, tshepo e e tsenang mo felong le le  boitshepo ka fa morago ga sesiro. \v 20 Jeso o tsene mo felong leo e le morongwa, o nnile moperesiti mogolo go ya bosakhutleng mo tsamaisong ya ga  Melekiseteke.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/07/01.txt b/07/01.txt
index 9047b51..4e6650d 100644
--- a/07/01.txt
+++ b/07/01.txt
@@ -1 +1,5 @@
-\c 7 \v 1 E ne e le Melekiseteka , kgosi ya Salema , moperesiti wa Modimo Mogodimodimo, yo o neng a segofatsa Aborahama fa a kopana nae a tswa go bolaya dikgosi abo a mosegofatsa. \v 2 Aborahama o ne a mo fa bolesome jwa sengwe le sengwe . Leina le la gagwe ''Melekiseteka'' le raya ''kgosi ya tshiamo''. Maemo a mangwe a gagwe ke '' kgosi ya Salema'' , ke gore '' kgosi ya kagiso''. \v 3 Ga a na rraagwe , mmaagwe , asena borragwe mogolo, le fa e le matsalo le yone phelelo ya botshelo . Boemong jwa moo, o tshwana le Morwa Modimo, gonne o ntse moperesiti ka bosakhutleng .
\ No newline at end of file
+<<<<<<< HEAD
+\c 7 \v 1 E ne e le Melekiseteka , kgosi ya Salema , moperesiti wa Modimo Mogodimodimo, yo o neng a segofatsa Aborahama fa a kopana nae a tswa go bolaya dikgosi abo a mosegofatsa. \v 2 Aborahama o ne a mo fa bolesome jwa sengwe le sengwe . Leina le la gagwe ''Melekiseteka'' le raya ''kgosi ya tshiamo''. Maemo a mangwe a gagwe ke '' kgosi ya Salema'' , ke gore '' kgosi ya kagiso''. \v 3 Ga a na rraagwe , mmaagwe , asena borragwe mogolo, le fa e le matsalo le yone phelelo ya botshelo . Boemong jwa moo, o tshwana le Morwa Modimo, gonne o ntse moperesiti ka bosakhutleng .
+=======
+\c 7 \v 1 E ne e le Melekiseteke , kgosi ya Salema , moperesiti wa Modimo Mogodimodimo, yo o neng a segofatsa Aborehama fa a kopana nae a tswa go bolaya dikgosi abo a mosegofatsa. \v 2 Aborehama o ne a mo fa bolesome jwa sengwe le sengwe . Leina le la gagwe ''Melekiseteke'' le raya ''kgosi ya tshiamo''. Maemo a mangwe a gagwe ke '' kgosi ya Salema'' , ke gore '' kgosi ya kagiso''. \v 3 Ga a na rraagwe , mmaagwe , ga a na borragwe mogolo, le fa e le matsalo le yone phelelo ya botshelo . Boemong jwa moo, o tshwana le Morwa Modimo, gonne o ntse moperesiti ka bosakhutleng.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/07/04.txt b/07/04.txt
index a2fb8c5..562a8f7 100644
--- a/07/04.txt
+++ b/07/04.txt
@@ -1 +1,5 @@
-\v 4 Bona ka fa monna yo a leng mogolo ka teng . Rraarona Aborahama o mo file bolesome jwa dilo tse a di tsereng kwa ntweng . \v 5 Ka fa ntlheng e nngwe , barwa Lifi ba amogela boperesiti ba na le taelo go tswa molaong go tsaya bolesome go tswa mo bathong , ke gore , go tswa mo go barwarraabone ntswa le bone ba tsetswe ke Aborahama . \v 6 Ka fa ntlheng e nngwe , Melekiseteka , yo matsalo a gagwe a neng a sa amane le bone , o ne a amogela bolesome mo go Aborahama , a bo a mo segofatsa , ebong ene yo o nang le ditsholofetso .
\ No newline at end of file
+<<<<<<< HEAD
+\v 4 Bona ka fa monna yo a leng mogolo ka teng . Rraarona Aborahama o mo file bolesome jwa dilo tse a di tsereng kwa ntweng . \v 5 Ka fa ntlheng e nngwe , barwa Lifi ba amogela boperesiti ba na le taelo go tswa molaong go tsaya bolesome go tswa mo bathong , ke gore , go tswa mo go barwarraabone ntswa le bone ba tsetswe ke Aborahama . \v 6 Ka fa ntlheng e nngwe , Melekiseteka , yo matsalo a gagwe a neng a sa amane le bone , o ne a amogela bolesome mo go Aborahama , a bo a mo segofatsa , ebong ene yo o nang le ditsholofetso .
+=======
+\v 4 Bona ka fa monna yo a ne a le mogolo ka teng . Rraarona Aborehama o mo file bolesome jwa dilo tse a di tsereng kwa ntweng . \v 5 Ka fa ntlheng e nngwe , barwa Lifi ba amogela boperesiti ba na le taelo go tswa molaong go tsaya bolesome go tswa mo bathong , ke gore , go tswa mo go barwarraabone ntswa le bone ba tsetswe ke Aborehama . \v 6 Ka fa ntlheng e nngwe , Melekiseteke , yo matsalo a gagwe a neng a sa amane le bone , o ne a amogela bolesome mo go Aborehama , a bo a mo segofatsa , ebong ene yo o nang le ditsholofetso .
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/07/07.txt b/07/07.txt
index 307856d..85dfd4d 100644
--- a/07/07.txt
+++ b/07/07.txt
@@ -1 +1,5 @@
-\v 7 Ga go kake ga latolwa gore motho yo mmotlana o segofadiwa ke yo mogolo . \v 8 Mo kgang e  batho ba madi le nama ba amogela bolesome , mme mo kgang ele , go bolelwa gore o tshelela ruri . \v 9 Go ka buiwa jaana , Lefi , yo o neng a amogela bolesome , o ne a ntsha bolesome ka Aborahama , \v 10 ka lebaka la gore Lefi o ne a le mo mmeleng wa ga rraagwe fa Melekiseteka a kopana le Aborahama .
\ No newline at end of file
+<<<<<<< HEAD
+\v 7 Ga go kake ga latolwa gore motho yo mmotlana o segofadiwa ke yo mogolo . \v 8 Mo kgang e  batho ba madi le nama ba amogela bolesome , mme mo kgang ele , go bolelwa gore o tshelela ruri . \v 9 Go ka buiwa jaana , Lefi , yo o neng a amogela bolesome , o ne a ntsha bolesome ka Aborahama , \v 10 ka lebaka la gore Lefi o ne a le mo mmeleng wa ga rraagwe fa Melekiseteka a kopana le Aborahama .
+=======
+\v 7 Ga go kake ga latolwa gore motho yo mmotlana o segofadiwa ke yo mogolo . \v 8 Mo kgang e,  batho ba madi le nama ba amogela bolesome , mme mo kgang ele , go bolelwa gore o tshelela ruri . \v 9 Go ka buiwa jaana , Lefi , yo o neng a amogela bolesome , o ne a ntsha bolesome ka Aborehama , \v 10 ka lebaka la gore Lefi o ne a le mo mmeleng wa ga rraagwe fa Melekiseteke a kopana le Aborehama.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/07/11.txt b/07/11.txt
index 59300fd..4e84e37 100644
--- a/07/11.txt
+++ b/07/11.txt
@@ -1 +1,5 @@
-\v 11 Jaanong fa ele gore go siamisiwa go ne go kgonega ka boperesiti ja seLefi ( gonne ka fa tlase ga sone batho ba ne ba amogela molao) , a go ne go tla bo go tlhokega gore go nne le boperesiti jo bo tshwanang le jwa ga Melekiseteka , bo bo bo sa lejwe bo tshwana le jwa ga Arone? \v 12 Gonne fa boperesiti bo fetolwa , molao le one o tshwanetse go fetolwa .
\ No newline at end of file
+<<<<<<< HEAD
+\v 11 Jaanong fa ele gore go siamisiwa go ne go kgonega ka boperesiti ja seLefi ( gonne ka fa tlase ga sone batho ba ne ba amogela molao) , a go ne go tla bo go tlhokega gore go nne le boperesiti jo bo tshwanang le jwa ga Melekiseteka , bo bo bo sa lejwe bo tshwana le jwa ga Arone? \v 12 Gonne fa boperesiti bo fetolwa , molao le one o tshwanetse go fetolwa .
+=======
+\v 11 Jaanong fa ele gore go siamisiwa go ne go kgonega ka boperesiti ja seLefi ( gonne ka fa tlase ga bone batho ba ne ba amogela molao) , a go ne go tla bo go tlhokega gore go nne le boperesiti jo bo tshwanang le jwa ga Melekiseteke, jo bo sa tshwaneng le jwa ga Arone? \v 12 Gonne fa boperesiti bo fetolwa, molao le one o tshwanetse go fetolwa.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/07/13.txt b/07/13.txt
index 2af39d7..4cc6108 100644
--- a/07/13.txt
+++ b/07/13.txt
@@ -1 +1,5 @@
-\v 13 Gonne ene yo dilo tse di buiwang ka ene ke wa morafe o sele , o go se nang ope yo o tswang mo go one yo o kileng a dira fa aletareng . \v 14 Jaanong go a itsege gore , Morena wa rona ke Mojuta , morafe o Moshe a se kileng a bua sepe ka one mabapi le baperesiti .
\ No newline at end of file
+<<<<<<< HEAD
+\v 13 Gonne ene yo dilo tse di buiwang ka ene ke wa morafe o sele , o go se nang ope yo o tswang mo go one yo o kileng a dira fa aletareng . \v 14 Jaanong go a itsege gore , Morena wa rona ke Mojuta , morafe o Moshe a se kileng a bua sepe ka one mabapi le baperesiti .
+=======
+\v 13 Gonne ene yo dilo tse di buiwang ka ene ke wa morafe o sele, o go se nang ope yo o tswang mo go one yo o kileng a dira fa aletareng. \v 14 Jaanong go a itsege gore, Morena wa rona ke Mojuta, morafe o Moshe a se kileng a bua sepe ka one mabapi le baperesiti.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/07/15.txt b/07/15.txt
index fd06342..4590970 100644
--- a/07/15.txt
+++ b/07/15.txt
@@ -1 +1,5 @@
-\v 15 Se re se buang se tlhatswega bogolo fa go ka nna moperesiti mongwe yo o tshwanang le Melekiseteka . \v 16 Ga a nna moperesiti ka lebaka la go tsalwa ga gagwe mo senameng , mme e nnile ka lebaka la thata ya go tshelela ruri ga gagwe . \v 17 Gonne dikwalo di paka jaana ka ene : '' O moperesiti ka bosakhutleng jaaka Melekiseteka'' .
\ No newline at end of file
+<<<<<<< HEAD
+\v 15 Se re se buang se tlhatswega bogolo fa go ka nna moperesiti mongwe yo o tshwanang le Melekiseteka . \v 16 Ga a nna moperesiti ka lebaka la go tsalwa ga gagwe mo senameng , mme e nnile ka lebaka la thata ya go tshelela ruri ga gagwe . \v 17 Gonne dikwalo di paka jaana ka ene : '' O moperesiti ka bosakhutleng jaaka Melekiseteka'' .
+=======
+\v 15 Se re se buang se tlhatswega bogolo fa go ka nna moperesiti mongwe yo o tshwanang le Melekiseteka . \v 16 Ga a nna moperesiti ka lebaka la go tsalwa ga gagwe mo senameng, mme e nnile ka lebaka la thata ya botshelo jo bo sa senyegeng. \v 17 Gonne dikwalo di paka jaana ka ene: '' O moperesiti ka bosakhutleng jaaka Melekiseteke.''
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/07/18.txt b/07/18.txt
index ab2e9e4..1649b75 100644
--- a/07/18.txt
+++ b/07/18.txt
@@ -1 +1,5 @@
-\v 18 Gonne go ne ga fedisiwa taolo ya bogologolo ka gore e ne e le bokoa ebile e sena mosola . \v 19 Gonne molao o ne o sa siamise sepe . Le fa go ntse jalo , go tsisitswe bopelokgale jo botoka e ka yone re ka tlang  fa pele ga  Modimong.
\ No newline at end of file
+<<<<<<< HEAD
+\v 18 Gonne go ne ga fedisiwa taolo ya bogologolo ka gore e ne e le bokoa ebile e sena mosola . \v 19 Gonne molao o ne o sa siamise sepe . Le fa go ntse jalo , go tsisitswe bopelokgale jo botoka e ka yone re ka tlang  fa pele ga  Modimong.
+=======
+\v 18 Gonne go ne ga fedisiwa taolo ya bogologolo ka gore e ne e le bokoa ebile e sena mosola. \v 19 Gonne molao o ne o sa siamise sepe. Le fa go ntse jalo, go tsisitswe botlhokapoifo jo bo botoka jo ka bone re ka tlang  fa pele ga Modimo.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/07/20.txt b/07/20.txt
index dc24632..8f7f9d5 100644
--- a/07/20.txt
+++ b/07/20.txt
@@ -1 +1,5 @@
-\v 20 Se ga se a diragala ka ntleng le go ikana . Ka ntlheng e nngwe , ba bangwe ba nna baperesiti ka ntle le go ikana . \v 21 Mme ka ntlheng e nngwe , yo ene , Jeso , o nnile moperesiti ka maikano ka mongwe yo neng a mo raya a re '' Morena o ikanne ebile ga a na go fetola mogopolo: O moperesiti ka bosakhutleng'' .
\ No newline at end of file
+<<<<<<< HEAD
+\v 20 Se ga se a diragala ka ntleng le go ikana . Ka ntlheng e nngwe , ba bangwe ba nna baperesiti ka ntle le go ikana . \v 21 Mme ka ntlheng e nngwe , yo ene , Jeso , o nnile moperesiti ka maikano ka mongwe yo neng a mo raya a re '' Morena o ikanne ebile ga a na go fetola mogopolo: O moperesiti ka bosakhutleng'' .
+=======
+\v 20 Se ga se a diragala go sa ikanwa.Mme ba  bangwe bone, ba nna baperesiti go se na maikano ape. \v 21 Mme Jeso ene, o nnile moperesiti ka maikano a mongwe yo o neng a mo raya a re,'' Morena o ikanne ebile ga a na go fetola mogopolo: "O moperesiti ka bosakhutleng.''
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/07/22.txt b/07/22.txt
index 42f548d..60bd50e 100644
--- a/07/22.txt
+++ b/07/22.txt
@@ -1 +1,5 @@
-\v 22 Ka se Jeso o file tlhomamiso ya kgolagano e e botoka . \v 23 Ka ntlha e nngwe , bontsi bo nna baperesiti ka gore fa ba swa ga go kgonege go tsweledisa . \v 24 Ka ntlha e nngwe , ka lebaka la gore Jeso o ntse ka bosakhutleng , O na le boperesiti jo bo sa feleng .
\ No newline at end of file
+<<<<<<< HEAD
+\v 22 Ka se Jeso o file tlhomamiso ya kgolagano e e botoka . \v 23 Ka ntlha e nngwe , bontsi bo nna baperesiti ka gore fa ba swa ga go kgonege go tsweledisa . \v 24 Ka ntlha e nngwe , ka lebaka la gore Jeso o ntse ka bosakhutleng , O na le boperesiti jo bo sa feleng .
+=======
+\v 22 Ka se Jeso o file tlhomamiso ya kgolagano e e botoka . \v 23 Mme bontsi bo nna baperesiti ka gore fa ba a swa, ga go kgonege go tsweledisa . \v 24 Mme ka gore Jeso o ntse ka bosakhutleng, o na le boperesiti jo bo sa feleng .
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/07/25.txt b/07/25.txt
index dd5e00a..b9b23c0 100644
--- a/07/25.txt
+++ b/07/25.txt
@@ -1 +1,5 @@
-\v 25 Ka jalo , Jeso o kgona go boloka mo go feletseng botlhe ba ba tlang ko Modimong ka Ene , ka lebaka la gore O tshelela ruri go ba rapelela . \v 26 Gonne moperesitimogolo yo o ntseng jaana o re siametse . Ga a na boleo , ga a na molato ope , o phepa , ebile o tlhaotswe mo baleofing , ebile o godimo go feta magodimo .
\ No newline at end of file
+<<<<<<< HEAD
+\v 25 Ka jalo , Jeso o kgona go boloka mo go feletseng botlhe ba ba tlang ko Modimong ka Ene , ka lebaka la gore O tshelela ruri go ba rapelela . \v 26 Gonne moperesitimogolo yo o ntseng jaana o re siametse . Ga a na boleo , ga a na molato ope , o phepa , ebile o tlhaotswe mo baleofing , ebile o godimo go feta magodimo .
+=======
+\v 25 Ka jalo , Jeso o kgona go boloka mo go feletseng botlhe ba ba tlang ko Modimong ka Ene , ka lebaka la gore O tshelela ruri go ba rapelela . \v 26 Gonne moperesiti mogolo yo o ntseng jaana o re siametse . Ga a na boleo , ga a na molato ope , o phepa , ebile o tlhaotswe mo baleofing , ebile o godimo go feta magodimo .
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/07/27.txt b/07/27.txt
index b9c00ff..64a2390 100644
--- a/07/27.txt
+++ b/07/27.txt
@@ -1 +1,5 @@
-\v 27 Ga a tlhoke go nna a ntsha setlhabelo sa letsatsi le letsatsi jaaka baperesitibagolo ba bangwe , ba ba neng ba ntshetsa maleo a bone le a batho . Ene o dirile gangwe a direla botlhe , fa a intsha setlhabelo . \v 28 Gonne molao o tlhoma banna ba ba nang le makoa a bone go nna baperesiti . Mme lefoko la maikano , le le tsileng fa morago ga molao, la tlhoma Morwa , Yo o siamisitsweng ka bosakhutleng .
\ No newline at end of file
+<<<<<<< HEAD
+\v 27 Ga a tlhoke go nna a ntsha setlhabelo sa letsatsi le letsatsi jaaka baperesitibagolo ba bangwe , ba ba neng ba ntshetsa maleo a bone le a batho . Ene o dirile gangwe a direla botlhe , fa a intsha setlhabelo . \v 28 Gonne molao o tlhoma banna ba ba nang le makoa a bone go nna baperesiti . Mme lefoko la maikano , le le tsileng fa morago ga molao, la tlhoma Morwa , Yo o siamisitsweng ka bosakhutleng .
+=======
+\v 27 Ga a tlhoke go nna a ntsha setlhabelo sa letsatsi le letsatsi jaaka baperesiti bagolo ba bangwe, ba ba neng ba ntshetsa maleo a bone le a batho. Ene o dirile gangwe a direla botlhe, fa a intsha setlhabelo. \v 28 Gonne molao o tlhoma banna ba ba nang le makoa a bone go nna baperesiti. Mme lefoko la maikano, le le tsileng fa morago ga molao, la tlhoma Morwa, yo o siamisitsweng ka bosakhutleng .
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/08/01.txt b/08/01.txt
index d20b2ec..17e836c 100644
--- a/08/01.txt
+++ b/08/01.txt
@@ -1 +1,5 @@
-\c 8 \v 1 Jaanong thito kgang ya se re se buang ke e: re na le moperesita mogolo yo a ntseng ko letsogong le legolo la ga kgosi Rara, mo teroneng ko magodimong. \v 2 Ke montlhanka mo felong le le boitshepo, tabanekele ya boamaruri e Modimo a e agileng, eseng motho.
\ No newline at end of file
+<<<<<<< HEAD
+\c 8 \v 1 Jaanong thito kgang ya se re se buang ke e: re na le moperesita mogolo yo a ntseng ko letsogong le legolo la ga kgosi Rara, mo teroneng ko magodimong. \v 2 Ke montlhanka mo felong le le boitshepo, tabanekele ya boamaruri e Modimo a e agileng, eseng motho.
+=======
+\c 8 \v 1 Jaanong kgangkgolo ya se re se buang ke e: re na le moperesiti mogolo yo a ntseng mo letsogong le legolo la Morena mo setilong sa bogosi ko magodimong. \v 2 Ke montlhanka mo felong le le boitshepo, motlaagana wa boammaaruri o Modimo a o agileng, eseng motho.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/08/03.txt b/08/03.txt
index 6b1e72b..3d1ffa8 100644
--- a/08/03.txt
+++ b/08/03.txt
@@ -1 +1,5 @@
-\v 3 Gonne moperesiti mogolo mongwe le mongwe o tlhometswe go ntsha dimpho le ditlhabelo. Ka jalo go botlhokwa go nna le sengwe se o ka se nayang. \v 4 Jaanong fa Keresete a kabo a le mo lefatsheng, a kabo bo a se moperesiti, gonne go na le ba bangwe ba ba ntshang dimpho go yeng ka fa molaong. \v 5 Ba direla mo tabanekele e e leng moriti wa dilo tsa selegodimo. Go ntse hela jaaka Moshe a ne a tlhagisiwa ke Modimo, fa a ne a tshwanetse go aga tabanekele, Modimo a bua a re "Bona gore o dira sengwe le sengwe go yeng ka fa o supegeditsweng ka teng fa o le ko thabeng."
\ No newline at end of file
+<<<<<<< HEAD
+\v 3 Gonne moperesiti mogolo mongwe le mongwe o tlhometswe go ntsha dimpho le ditlhabelo. Ka jalo go botlhokwa go nna le sengwe se o ka se nayang. \v 4 Jaanong fa Keresete a kabo a le mo lefatsheng, a kabo bo a se moperesiti, gonne go na le ba bangwe ba ba ntshang dimpho go yeng ka fa molaong. \v 5 Ba direla mo tabanekele e e leng moriti wa dilo tsa selegodimo. Go ntse hela jaaka Moshe a ne a tlhagisiwa ke Modimo, fa a ne a tshwanetse go aga tabanekele, Modimo a bua a re "Bona gore o dira sengwe le sengwe go yeng ka fa o supegeditsweng ka teng fa o le ko thabeng."
+=======
+\v 3 Gonne moperesiti mogolo mongwe le mongwe o tlhometswe go ntsha dineo le ditlhabelo. Ka jalo go botlhokwa go nna le sengwe se o ka se nayang. \v 4 Jaanong fa Keresete a kabo a le mo lefatsheng, a kabo  a se moperesiti, gonne go na le ba bangwe ba ba ntshang dineo go ya ka fa molaong. \v 5 Ba direla mo motlaaganeng o e leng moriti wa dilo tsa selegodimo. Go ntse fela jaaka Moshe a ne a tlhagisiwa ke Modimo, fa a ne a tshwanetse go aga motlaagana, Modimo a re "Bona gore o dira sengwe le sengwe go ya ka fa o supegeditsweng ka teng fa o le ko thabeng."
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/08/06.txt b/08/06.txt
index 68def5d..bb5c36e 100644
--- a/08/06.txt
+++ b/08/06.txt
@@ -1 +1,5 @@
-\v 6 Mme jaanong Keresete o amogetse bodiredi jo bo botoka.Ka jaana a le motshereganyi wa kgolagano e e botoka, e e ikaegileng ka ditsholofetso tse di botoka. \v 7 Gonne fa nkabo kgolagano ya ntlha e sena mathata ape, nkabo go sa tlhokafale go tisiwa kgolagano  ya bobedi.
\ No newline at end of file
+<<<<<<< HEAD
+\v 6 Mme jaanong Keresete o amogetse bodiredi jo bo botoka.Ka jaana a le motshereganyi wa kgolagano e e botoka, e e ikaegileng ka ditsholofetso tse di botoka. \v 7 Gonne fa nkabo kgolagano ya ntlha e sena mathata ape, nkabo go sa tlhokafale go tisiwa kgolagano  ya bobedi.
+=======
+\v 6 Mme jaanong Keresete o amogetse bodiredi jo bo botoka.Ka jaana a le motshereganyi wa kgolagano e e botoka, e e ikaegileng ka ditsholofetso tse di botoka. \v 7 Gonne fa kgolagano ya ntlha e ne e sena mathata ape, go ne go sa tlhokafale kgolagano ya bobedi.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/08/08.txt b/08/08.txt
index 7ed7f7d..6926c77 100644
--- a/08/08.txt
+++ b/08/08.txt
@@ -1 +1,5 @@
-\v 8 Ya re Modimo a bona batho molato, a re, " Bonang malatsi a etla- go bua Modimo- a ke tla dirang kgolagano e ntshwa le ntlo ya Iseraela le ntlo ya Juta. \v 9 Ga go kitla go tshwana le kgolagano e ke e dirileng le borrabone mogolo ka letsatsi le ke neng ke ba tshwere ka letsogo go ba etelela pele go tswa mo lefatsheng la  Egepeto. Gonne ga ba ka ba tshegetsa kgolagano yame, mme ka ba itlhokomolosa-go bua Morena.
\ No newline at end of file
+<<<<<<< HEAD
+\v 8 Ya re Modimo a bona batho molato, a re, " Bonang malatsi a etla- go bua Modimo- a ke tla dirang kgolagano e ntshwa le ntlo ya Iseraela le ntlo ya Juta. \v 9 Ga go kitla go tshwana le kgolagano e ke e dirileng le borrabone mogolo ka letsatsi le ke neng ke ba tshwere ka letsogo go ba etelela pele go tswa mo lefatsheng la  Egepeto. Gonne ga ba ka ba tshegetsa kgolagano yame, mme ka ba itlhokomolosa-go bua Morena.
+=======
+\v 8 Ya re Modimo a bona batho molato, a re, " Bonang malatsi a etla - go bua Modimo - a ke tla dirang kgolagano e ntsha le ntlo ya Iseraela le ntlo ya Juta. \v 9 Ga e kitla e tshwana le kgolagano e ke e dirileng le borrabone mogolo ka letsatsi le ke neng ke ba tshwere ka letsogo go ba etelela pele go tswa mo lefatsheng la  Egepeto. Gonne ga ba ka ba tshegetsa kgolagano yame, mme ka ba itlhokomolosa-go bua Morena.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/08/10.txt b/08/10.txt
index e1f88f0..4d0f546 100644
--- a/08/10.txt
+++ b/08/10.txt
@@ -1 +1,5 @@
-\v 10 Gonne e ke kgolagano e ke yang go e dira le ntlo ya Iseraela morago ga  malatsi ao- go bua Morena. ke tla baya molao wame mo ditlhaloganyong tsa bone, ebile ke tla e kwala le mo dipelong tsa bone. ke tla nna Modimo wa bone, le bone  ba tla nna batho bame.
\ No newline at end of file
+<<<<<<< HEAD
+\v 10 Gonne e ke kgolagano e ke yang go e dira le ntlo ya Iseraela morago ga  malatsi ao- go bua Morena. ke tla baya molao wame mo ditlhaloganyong tsa bone, ebile ke tla e kwala le mo dipelong tsa bone. ke tla nna Modimo wa bone, le bone  ba tla nna batho bame.
+=======
+\v 10 Gonne e ke kgolagano e ke tlaa e le dirang le ntlo ya Iseraela morago ga  malatsi ao - go bua Morena. ke tla baya molao wame mo ditlhaloganyong tsa bone, ebile ke tla e kwala le mo dipelong tsa bone. ke tla nna Modimo wa bone, le bone  ba tla nna batho bame.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/08/11.txt b/08/11.txt
index 76cb707..226a740 100644
--- a/08/11.txt
+++ b/08/11.txt
@@ -1 +1,5 @@
-\v 11 Ope wa bone ga kitla a ruta moagisanyi wa gagwe le yo mongwe morwaraagwe, a re,' batla Morena.' Gonne botlhe ba tla nkitse, go tsweng mo go yo monnye goya ko go yo mogolo mo go bone. \v 12 Gonne ke tla nna kutlwelobotlhoko mo ditirong tsa bone tsa go tlhoka tshiamo, gape ga nkitla ke gakologelwa dibe tsa bone gape."
\ No newline at end of file
+<<<<<<< HEAD
+\v 11 Ope wa bone ga kitla a ruta moagisanyi wa gagwe le yo mongwe morwaraagwe, a re,' batla Morena.' Gonne botlhe ba tla nkitse, go tsweng mo go yo monnye goya ko go yo mogolo mo go bone. \v 12 Gonne ke tla nna kutlwelobotlhoko mo ditirong tsa bone tsa go tlhoka tshiamo, gape ga nkitla ke gakologelwa dibe tsa bone gape."
+=======
+\v 11 Ope wa bone ga a kitla a ruta moagisanyi wa gagwe le yo mongwe morwaraagwe, a re, "Itse Morena.'Gonne botlhe ba tla nkitse, go tsweng mo go yo monnye go ya ko go yo mogolo mo go bone. \v 12 Gonne ke tla nna kutlwelobotlhoko mo ditirong tsa bone tsa go tlhoka tshiamo, gape ga nkitla ke gakologelwa dibe tsa bone."
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/09/01.txt b/09/01.txt
index bbba1d4..3e90488 100644
--- a/09/01.txt
+++ b/09/01.txt
@@ -1 +1,5 @@
-\c 9 \v 1 Jaanong le kgolagano ya pele e ne  e na le ditsamaiso tsa kobamelo le letlole la selefatshe .  \v 2 Ka motlaagana o ne wa baakangwa. Ntlwana  e mo go yone go neng go na le setlhomo sa lebone , tafole, le borotho, e ne e bidiwa lefelo la boitshepo.
\ No newline at end of file
+<<<<<<< HEAD
+\c 9 \v 1 Jaanong le kgolagano ya pele e ne  e na le ditsamaiso tsa kobamelo le letlole la selefatshe .  \v 2 Ka motlaagana o ne wa baakangwa. Ntlwana  e mo go yone go neng go na le setlhomo sa lebone , tafole, le borotho, e ne e bidiwa lefelo la boitshepo.
+=======
+\c 9 \v 1 Jaanong le kgolagano ya pele e ne  e na le ditsamaiso tsa kobamelo le lefelo le le boitshepo la selefatshe . \v 2 Ka motlaagana o ne wa baakanngwa. Ntlwana  e mo go yone go neng go na le setlhomo sa lebone , tafole, le borotho, e ne e bidiwa lefelo la boitshepo.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/09/03.txt b/09/03.txt
index dd095da..db6cc6e 100644
--- a/09/03.txt
+++ b/09/03.txt
@@ -1 +1,5 @@
-\v 3 Kafa morago ga sesiro go ne go na le ntlwana e nngwe e bidiwa lefelo le le boitshepo  go gaisa.   \v 4 E ne e na le aletara ya gauta ya dinkgisa-monate. Gape e ne e na le letlole la kgolagano. Mo teng e ne e didilwe ka gauta. Mo teng go ne go na le sejana sa gauta se tshotse mana, thobane  ya ga Arone e e ileng ya tlhoga,le matlapana a kgolagano.  \v 5 Mo godimo ga letlole la kgolagano , dicheruba tse di galalelang di ne di okame sethibo sa letlole se re ka se keng ra bua ka sone ka botlalo.
\ No newline at end of file
+<<<<<<< HEAD
+\v 3 Kafa morago ga sesiro go ne go na le ntlwana e nngwe e bidiwa lefelo le le boitshepo  go gaisa.   \v 4 E ne e na le aletara ya gauta ya dinkgisa-monate. Gape e ne e na le letlole la kgolagano. Mo teng e ne e didilwe ka gauta. Mo teng go ne go na le sejana sa gauta se tshotse mana, thobane  ya ga Arone e e ileng ya tlhoga,le matlapana a kgolagano.  \v 5 Mo godimo ga letlole la kgolagano , dicheruba tse di galalelang di ne di okame sethibo sa letlole se re ka se keng ra bua ka sone ka botlalo.
+=======
+\v 3 Ka fa morago ga sesiro go ne go na le ntlwana e nngwe e bidiwa lefelo le le boitshepo ga boitshepo. \v 4 E ne e na le aletara ya gauta ya dinkgisa-monate. Gape e ne e na le letlole la kgolagano, e apesitswe ka gauta. Mo teng go ne go na le sejana sa gauta se tshotse mana, thobane  ya ga Arone e e ileng ya tlhoga,le matlapana a kgolagano. \v 5 Mo godimo ga letlole la kgolagano , dicheruba tse di galalelang di ne di okame sethibo sa letlole, se re ka se keng ra bua ka sone ka botlalo.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/09/06.txt b/09/06.txt
index ba0f5de..234b76b 100644
--- a/09/06.txt
+++ b/09/06.txt
@@ -1 +1,5 @@
-\v 6 Fa dilo tse di sena go baakanngwa, baperesiti ba ne ba tsena mo ntlwaneng e  e kontle  ya motlaagana go dira ditiro tsa bone.   \v 7 Mme moperesiti mogolo ke ene fela a neng a tsena mo ntlwaneng ya bobedi gangwe fela mo ngwageng a tshotse madi, a a neng  a a iketshetsa, le batho, e le  a maleo a e seng a kabomo.
\ No newline at end of file
+<<<<<<< HEAD
+\v 6 Fa dilo tse di sena go baakanngwa, baperesiti ba ne ba tsena mo ntlwaneng e  e kontle  ya motlaagana go dira ditiro tsa bone.   \v 7 Mme moperesiti mogolo ke ene fela a neng a tsena mo ntlwaneng ya bobedi gangwe fela mo ngwageng a tshotse madi, a a neng  a a iketshetsa, le batho, e le  a maleo a e seng a kabomo.
+=======
+\v 6 Fa dilo tse di sena go baakanngwa, baperesiti ba ne ba tsena mo ntlwaneng e e kwa ntle ya motlaagana go dira ditiro tsa bone. \v 7 Mme moperesiti mogolo ke ene fela a neng a tsena mo ntlwaneng ya bobedi gangwe fela mo ngwageng a tshotse madi, a a neng  a a iketshetsa le batho, e le a maleo a e seng a kabomo.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/09/08.txt b/09/08.txt
index 357e9f1..74cc7e0 100644
--- a/09/08.txt
+++ b/09/08.txt
@@ -1 +1,5 @@
-\v 8 Moya o o boitshepo o ne wa supa gore tsela  ya go tsena mo lefelong  le le boitshepo go gaisa, e ne e sa supiwa, fa motlaagana wa pele o santse o le teng.   \v 9 Se e ne ele tlhaloso ya nako eno. Dimpho le ditlhabelo tse di   ntshiwang gadi kgone go siamisa segakolodi sa modumedi.  \v 10 Ba  kgathala fela ka ga dijo le dino le ka mehuta ya  modiro wa go itlhapisa ga go yeng ka fa tumeding  ya bone. Tse tsotlhe e ne e le ditsamaiso tsa senama tse dineng di  beilwe go fitlhelela tsamaiso e ntsha e dirwa.
\ No newline at end of file
+<<<<<<< HEAD
+\v 8 Moya o o boitshepo o ne wa supa gore tsela  ya go tsena mo lefelong  le le boitshepo go gaisa, e ne e sa supiwa, fa motlaagana wa pele o santse o le teng.   \v 9 Se e ne ele tlhaloso ya nako eno. Dimpho le ditlhabelo tse di   ntshiwang gadi kgone go siamisa segakolodi sa modumedi.  \v 10 Ba  kgathala fela ka ga dijo le dino le ka mehuta ya  modiro wa go itlhapisa ga go yeng ka fa tumeding  ya bone. Tse tsotlhe e ne e le ditsamaiso tsa senama tse dineng di  beilwe go fitlhelela tsamaiso e ntsha e dirwa.
+=======
+\v 8 Moya o o boitshepo o ne wa supa gore tsela  ya go tsena mo lefelong  le le boitshepo ja boitshepo, e ne e sa supiwa, fa motlaagana wa pele o santse o le teng. \v 9 Se e ne ele tlhaloso ya nako eno. Dineo le ditlhabelo tse di ntshiwang gadi kgone go siamisa segakolodi sa moobamedi. \v 10 Ba  kgathala fela ka ga dijo le dino le ka mefuta ya  mediro wa go itlhapisa ga go ya ka fa tumeding  ya bone. Tse tsotlhe e ne e le ditsamaiso tsa senama tse dineng di beilwe go fitlhelela tsamaiso e ntsha e dirwa.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/09/11.txt b/09/11.txt
index 42eea0b..3ea390b 100644
--- a/09/11.txt
+++ b/09/11.txt
@@ -1 +1,5 @@
-\v 11 Keresete o tsile e le moperesiti  yo mogolo  wa  dilo tse dintle tse di tsileng. O raletse motlaagana o mogolo o o siameng  o o neng o sa dirwa ka diatla tsa batho, yo o seng  wa lefatshe  le le dirilweng le.  \v 12 Ga a tsena ka madi a dipudi , le dinamane , mme o tsene ka madi a gagwe mo lefelong le le boitshepo go gaisa  , a tsenela botlhe mme a re rekolola ka bosakhutleng.
\ No newline at end of file
+<<<<<<< HEAD
+\v 11 Keresete o tsile e le moperesiti  yo mogolo  wa  dilo tse dintle tse di tsileng. O raletse motlaagana o mogolo o o siameng  o o neng o sa dirwa ka diatla tsa batho, yo o seng  wa lefatshe  le le dirilweng le.  \v 12 Ga a tsena ka madi a dipudi , le dinamane , mme o tsene ka madi a gagwe mo lefelong le le boitshepo go gaisa  , a tsenela botlhe mme a re rekolola ka bosakhutleng.
+=======
+\v 11 Keresete o tsile e le moperesiti  yo mogolo  wa  dilo tse dintle tse di tsileng. O raletse motlaagana o mogolo o o siameng  o o neng o sa dirwa ka diatla tsa batho, yo o seng  wa lefatshe  le le dirilweng le. \v 12 Ga a tsena ka madi a dipudi , le dinamane , mme o tsene ka madi a gagwe mo lefelong le le boitshepo ja boitshepo, a tsenela botlhe mme a re rekolola ka bosakhutleng.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/09/13.txt b/09/13.txt
index 5f814c9..28c9db9 100644
--- a/09/13.txt
+++ b/09/13.txt
@@ -1 +1,5 @@
-\v 13 Gonne fa madi a dipodi le dipoo , le go kgatsha molora wa moroba mo go ba ba itshekologileng, go ba tsisa gautshwane le Modimo ka go ntlafadiwa nama ya bone,  \v 14 madi a aga Kersete yo ka moya o o boitshepo a ikitshitseng setlhabelo se se senang bogole , go tlhapisa letswalo la rona mo ditirong tse di suleng, gore re kgone go direla modimo yo otshidileng, a tla re ntlafatsa bogolo jang?  \v 15 Ke ka moo e leng motshereganyi mo kgolaganong e ntsha. Gonne  leso le nnile go golola  ba ba kafa tlase ga kgolagano ya ntlha mo maleong a bone, ba ba biditsweng ba tla amogela tsholofetso ya boswa jo bo sa feleng .
\ No newline at end of file
+<<<<<<< HEAD
+\v 13 Gonne fa madi a dipodi le dipoo , le go kgatsha molora wa moroba mo go ba ba itshekologileng, go ba tsisa gautshwane le Modimo ka go ntlafadiwa nama ya bone,  \v 14 madi a aga Kersete yo ka moya o o boitshepo a ikitshitseng setlhabelo se se senang bogole , go tlhapisa letswalo la rona mo ditirong tse di suleng, gore re kgone go direla modimo yo otshidileng, a tla re ntlafatsa bogolo jang?  \v 15 Ke ka moo e leng motshereganyi mo kgolaganong e ntsha. Gonne  leso le nnile go golola  ba ba kafa tlase ga kgolagano ya ntlha mo maleong a bone, ba ba biditsweng ba tla amogela tsholofetso ya boswa jo bo sa feleng .
+=======
+\v 13 Gonne fa madi a dipodi le dipoo , le go kgatsha molora wa moroba mo go ba ba itshekologileng, go ba tsisa gautshwane le Modimo ka go ntlafadiwa nama ya bone, \v 14 madi a aga Keresete yo ka Moya o o boitshepo a ikitshitseng setlhabelo se se senang bogole , go tlhapisa letswalo la rona mo ditirong tse di suleng gore re kgone go direla Modimo yo o tshelang, a tla re ntlafatsa bogolo jang? \v 15 Ke ka moo a leng motshereganyi mo kgolaganong e ntsha. Ka lebaka le,le ka go bo leso lengwe le nnile teng go golola  ba ba kafa tlase ga kgolagano ya ntlha mo maleong a bone, ba ba biditsweng ba tla amogela tsholofetso ya boswa jo bo sa feleng .
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/09/16.txt b/09/16.txt
index 24d96a6..6bc4cbf 100644
--- a/09/16.txt
+++ b/09/16.txt
@@ -1 +1,5 @@
-\v 16 Gonne fa go nang le mokwalo wa kabo ya boswa, leso la yo o dirileng le tshwanetse go rurufadiwa.  \v 17 Gonne mokwalo wa kabo ya boswa o diragadiwa fela fa yo o kwadileng a sule, fa a santse a tshela ga o na thata epe.
\ No newline at end of file
+<<<<<<< HEAD
+\v 16 Gonne fa go nang le mokwalo wa kabo ya boswa, leso la yo o dirileng le tshwanetse go rurufadiwa.  \v 17 Gonne mokwalo wa kabo ya boswa o diragadiwa fela fa yo o kwadileng a sule, fa a santse a tshela ga o na thata epe.
+=======
+\v 16 Gonne fa go nang le mokwalo wa kabo ya boswa, leso la yo o o dirileng le tshwanetse go rurufadiwa. \v 17 Gonne mokwalo wa kabo ya boswa o diragadiwa fela fa yo o kwadileng a sule, fa a santse a tshela ga o na thata epe.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/09/21.txt b/09/21.txt
index 13a9ee3..0154ffc 100644
--- a/09/21.txt
+++ b/09/21.txt
@@ -1 +1,5 @@
-\v 21  Ka mokgwa o o tshwanang o ne a kgatsha madi mo motlaaganeng le dijana tsotlhe tse di neng di dirisiwa mo tirelong .  \v 22 Go ya ka molao , dilo ka bontsi di tlhapisiwa ka madi. kontle ga tshololo ya madi ,ga gona boitshwarelo.
\ No newline at end of file
+<<<<<<< HEAD
+\v 21  Ka mokgwa o o tshwanang o ne a kgatsha madi mo motlaaganeng le dijana tsotlhe tse di neng di dirisiwa mo tirelong .  \v 22 Go ya ka molao , dilo ka bontsi di tlhapisiwa ka madi. kontle ga tshololo ya madi ,ga gona boitshwarelo.
+=======
+\v 21  Ka mokgwa o o tshwanang, o ne a kgatsha madi mo motlaaganeng le dijana tsotlhe tse di neng di dirisiwa mo tirelong . \v 22 Go ya ka molao , dilo ka bontsi di tlhapisiwa ka madi. kontle ga tshololo ya madi ,ga gona boitshwarelo.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/09/23.txt b/09/23.txt
index 4dcef2f..06ba5ba 100644
--- a/09/23.txt
+++ b/09/23.txt
@@ -1 +1,5 @@
-\v 23 Jalo he, go ne go tlhokafala gore meriti ya dilo tse di kwa legodimong di tshwanetse go ntlafadiwa ka madi a ditlhabelo tsa diphologolo. Lefa gontse jalo dilo tsa legodimo tsone di ne di tshwanelwa ke go tlhapisiwa ka ditlhabelo tse di botoka .  \v 24 Keresete ga a tsena mo lefelong le le boitshepo go gaisa le le  dirilweng ka diatla, se e leng moriti fela wa  dilo tsa nnete. Mo boemong jwa seo,a tsene mo legodimong la nnete, gore jaanong a re emele fa pele ga Modimo.
\ No newline at end of file
+<<<<<<< HEAD
+\v 23 Jalo he, go ne go tlhokafala gore meriti ya dilo tse di kwa legodimong di tshwanetse go ntlafadiwa ka madi a ditlhabelo tsa diphologolo. Lefa gontse jalo dilo tsa legodimo tsone di ne di tshwanelwa ke go tlhapisiwa ka ditlhabelo tse di botoka .  \v 24 Keresete ga a tsena mo lefelong le le boitshepo go gaisa le le  dirilweng ka diatla, se e leng moriti fela wa  dilo tsa nnete. Mo boemong jwa seo,a tsene mo legodimong la nnete, gore jaanong a re emele fa pele ga Modimo.
+=======
+\v 23 Jalo he, go ne go tlhokafala gore meriti ya dilo tse di kwa legodimong di tshwanetse go ntlafadiwa ka madi a ditlhabelo tsa diphologolo. Lefa gontse jalo, dilo tsa legodimo tsone di ne di tshwanelwa ke go tlhapisiwa ka ditlhabelo tse di botoka . \v 24 Keresete ga a tsena mo lefelong le le boitshepo ja boitshepo le le  dirilweng ka diatla, se e leng moriti fela wa  dilo tsa nnete. Mo boemong jwa seo,a tsene mo legodimong la nnete, gore jaanong a re emele fa pele ga Modimo.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/09/25.txt b/09/25.txt
index 7a03408..2daf531 100644
--- a/09/25.txt
+++ b/09/25.txt
@@ -1 +1,5 @@
-\v 25 Ga aa ya koo gore a iketshe gantsi, jaaka moperesiti yo mogolo yo o neng a tsena mo lefelong la boitshepo  ngwaga le ngwaga ka madi a yo mongwe .   \v 26 Fa go ne go ntse jalo o ne a ka tshwanelwa ke go boga gantsi go tswa kwa motheong wa lefatshe. Mme jaanong ke gangwefela kwa bofelong jwa metlha, e e kailweng gore a nyeletse sebe ka go intsha  setlhabelo.
\ No newline at end of file
+<<<<<<< HEAD
+\v 25 Ga aa ya koo gore a iketshe gantsi, jaaka moperesiti yo mogolo yo o neng a tsena mo lefelong la boitshepo  ngwaga le ngwaga ka madi a yo mongwe .   \v 26 Fa go ne go ntse jalo o ne a ka tshwanelwa ke go boga gantsi go tswa kwa motheong wa lefatshe. Mme jaanong ke gangwefela kwa bofelong jwa metlha, e e kailweng gore a nyeletse sebe ka go intsha  setlhabelo.
+=======
+\v 25 Ga a a ya koo gore a intshe setlhabelo gantsi, jaaka moperesiti yo mogolo yo o neng a tsena mo lefelong la boitshepo ja boitshepo ngwaga le ngwaga ka madi a yo mongwe . \v 26 Fa go ne go ntse jalo, o ne a ka tshwanelwa ke go boga gantsi go tswa kwa motheong wa lefatshe. Mme jaanong ke gangwe fela kwa bofelong jwa metlha, e e kailweng gore a nyeletse sebe ka go intsha setlhabelo.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/09/27.txt b/09/27.txt
index 9c4d7de..0982abd 100644
--- a/09/27.txt
+++ b/09/27.txt
@@ -1 +1,5 @@
-\v 27 Mongwe le mogwe o laoletswe go swa gangwefela mme morago go tla katlholo.  \v 28 Ka mokgwa o o tshwanang, Keresete le ene, yo o neng a ntshiwa ga ngwefela go  phimola maleo a ba le bantsi, o tla a bonala lwa bobedi a sa tlela sebe , mme o tlela kgololo ya ba o ba ba moletileng ka bopelotelele.
\ No newline at end of file
+<<<<<<< HEAD
+\v 27 Mongwe le mogwe o laoletswe go swa gangwefela mme morago go tla katlholo.  \v 28 Ka mokgwa o o tshwanang, Keresete le ene, yo o neng a ntshiwa ga ngwefela go  phimola maleo a ba le bantsi, o tla a bonala lwa bobedi a sa tlela sebe , mme o tlela kgololo ya ba o ba ba moletileng ka bopelotelele.
+=======
+\v 27 Mongwe le mogwe o laoletswe go swa gangwe fela mme morago go tla katlholo. \v 28 Ka mokgwa o o tshwanang, Keresete le ene, yo o neng a ntshiwa gangwe fela go  phimola maleo a ba le bantsi, o tla a bonala la bobedi a sa tlele sebe , mme a tlela kgololo ya bao ba ba mo letileng ka bopelotelele.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/10/01.txt b/10/01.txt
index 6c9348f..72cf489 100644
--- a/10/01.txt
+++ b/10/01.txt
@@ -1 +1,5 @@
-\c 10 \v 1 Gonne molao ke moriti wa dilo tse di siameng tse di tlang, eseng dilo tse di dirilweng ke bone, bao ba ba lekang Modimo ba ka se nne ditlhabelo tsa baperesite tse di nnang ditla ngwaga le ngwaga. \v 2 E seng jalo ditlhabelo di kabe disa bolo go khutla, fa batho ba sena go phepafadiwa. \v 3 Ka ditlhabelo tseo go nale kgakologelo ya dibe  ngwaga le ngwaga. \v 4 Ka ga go kake ga kgonega gore madi a dipholo le dipodi a ka phimola dibe.
\ No newline at end of file
+<<<<<<< HEAD
+\c 10 \v 1 Gonne molao ke moriti wa dilo tse di siameng tse di tlang, eseng dilo tse di dirilweng ke bone, bao ba ba lekang Modimo ba ka se nne ditlhabelo tsa baperesite tse di nnang ditla ngwaga le ngwaga. \v 2 E seng jalo ditlhabelo di kabe disa bolo go khutla, fa batho ba sena go phepafadiwa. \v 3 Ka ditlhabelo tseo go nale kgakologelo ya dibe  ngwaga le ngwaga. \v 4 Ka ga go kake ga kgonega gore madi a dipholo le dipodi a ka phimola dibe.
+=======
+\c 10 \v 1 Gonne molao ke moriti fela wa dilo tse di molemo tse di tlang, eseng tsone dilo tseo tota . Bao ba ba atamelang Modimo ga ba kitla ba dirwa boitekanelo ke ditlhabelo tse baperesiti ba di isang ngwaga le ngwaga. \v 2 Fa go ne go ntse jalo, a ditlhabelo tseo  di kabo di sa bolo go emisiwa? Ka jalo, fa ba ne ba ntlafaditswe gangwe fela go feletse, baobamedi ba ne ba ka seka ba  ba tlhola ba gakologela boleo. \v 3 Ka ditlhabelo tseo go na le kgakologelo ya maleo ngwaga le ngwaga. \v 4 Ka go bo go sa kgonege gore madi a dipholo le dipodi a ka phimola maleo.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/10/05.txt b/10/05.txt
index 2459e24..34fa2eb 100644
--- a/10/05.txt
+++ b/10/05.txt
@@ -1 +1,5 @@
-\v 5 Fa Keresete a tla mo lefatsheng one are, ¨e ne e se ka ditlhabelo le meneelo ya lona ka mmele o o ikgethetseng. Lefa gontse jalo, ke mmele  o ke neng ke o baaknyeditswe.  \v 6 Ditlhabelo tse di fisitsweng letsa boleo ga dia go natefelela \v 7 Foo ke ne kare, ´bona, ke nna, jaaka go kwadilwe ka game mo lokwalong, go dira thato ya gago´´´
\ No newline at end of file
+<<<<<<< HEAD
+\v 5 Fa Keresete a tla mo lefatsheng one are, ¨e ne e se ka ditlhabelo le meneelo ya lona ka mmele o o ikgethetseng. Lefa gontse jalo, ke mmele  o ke neng ke o baaknyeditswe.  \v 6 Ditlhabelo tse di fisitsweng letsa boleo ga dia go natefelela \v 7 Foo ke ne kare, ´bona, ke nna, jaaka go kwadilwe ka game mo lokwalong, go dira thato ya gago´´´
+=======
+\v 5 Fa Keresete a tla mo lefatsheng o ne a re, ¨E ne e se ditlhabelo le meneelo tse o di eletsang. Le fa go ntse jalo, ke mmele o ke o baakanyeditsweng. \v 6 Ga o itumelele meneelo e e fisiwang le ditlhabelo tsa boleo. \v 7 Foo ke ne ka re, ''Bona, ke fano, jaaka go kwadilwe ka game mo lekwalong, go dira thato ya gago.''
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/10/08.txt b/10/08.txt
index f1f8a61..1bf410a 100644
--- a/10/08.txt
+++ b/10/08.txt
@@ -1 +1,5 @@
-\v 8 Lantlha o rile, ´´e ne e le ka ditlhabelo kana meneelo kgotsa ditlhabelo tsedi fisitsweng kgotsa meneelo ya dibe tse lo di ikgethetseng.´´ Tse ke ditlhabelo tse lo di neetsweng  go tswa mo molaong. \v 9 Are, ¨bona, ke fano go dira thata ya lona.´´O tsere mokgwa wa ntlha go bona wa bobedi. \v 10 Ka thato eo, re itshepisitswe ka moneelo wa mmele wa ga  Jeso Keresete ba rotlhe.
\ No newline at end of file
+<<<<<<< HEAD
+\v 8 Lantlha o rile, ´´e ne e le ka ditlhabelo kana meneelo kgotsa ditlhabelo tsedi fisitsweng kgotsa meneelo ya dibe tse lo di ikgethetseng.´´ Tse ke ditlhabelo tse lo di neetsweng  go tswa mo molaong. \v 9 Are, ¨bona, ke fano go dira thata ya lona.´´O tsere mokgwa wa ntlha go bona wa bobedi. \v 10 Ka thato eo, re itshepisitswe ka moneelo wa mmele wa ga  Jeso Keresete ba rotlhe.
+=======
+\v 8 La ntlha o rile, ''E ne e se ka ditlhabelo kana meneelo kgotsa ditlhabelo tsedi fisitsweng kgotsa meneelo ya maleo tse le di ikgethetseng. Ga o a ka wa di itumelela. Tse ke ditlhabelo tse di neelwang go ya ka molao. \v 9 A re,'' Bona, ke fano go dira thato ya gago. ''A tlosa tsamaiso ya ntlha go tlhomamisa ya bobedi. \v 10 Ka thato eo, re itshepisitswe ka moneelo wa mmele wa ga  Jeso Keresete gangwe fela.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/10/11.txt b/10/11.txt
index cff82e1..6d661ef 100644
--- a/10/11.txt
+++ b/10/11.txt
@@ -1 +1,5 @@
-\v 11 Mo lebogong le lengwe, moperesite one a ema tsatsi le letsatsi go direla Modimo. O ne a nna a neela ditlhabelo mme di ka seke tsa tsaya maleo. \v 12 Mo letsogong le lengwe keresete one a neela setlhabelo sa maleo botshelo jotlhe, one a nna mo letsogong le legolo la Modimo. \v 13 O eme go fitlhela baba ba gagwe ba ema mo maotong a gagwe. \v 14 Mo moneelong o le mongwe o siamiseditse ruri  ya botlhe baba itshepisitsweng.
\ No newline at end of file
+<<<<<<< HEAD
+\v 11 Mo lebogong le lengwe, moperesite one a ema tsatsi le letsatsi go direla Modimo. O ne a nna a neela ditlhabelo mme di ka seke tsa tsaya maleo. \v 12 Mo letsogong le lengwe keresete one a neela setlhabelo sa maleo botshelo jotlhe, one a nna mo letsogong le legolo la Modimo. \v 13 O eme go fitlhela baba ba gagwe ba ema mo maotong a gagwe. \v 14 Mo moneelong o le mongwe o siamiseditse ruri  ya botlhe baba itshepisitsweng.
+=======
+\v 11 Le fa go ntse jalo, moperesiti mongwe le mongwe one a ema letsatsi le letsatsi go direla Modimo. O ne a nna a neela ditlhabelo mme di ka seke tsa tlosa maleo. \v 12 Ka jalo, Keresete o ne a neela setlhabelo sa maleo gangwe ka bosakhutleng, a nna mo letsogong le legolo la Modimo. \v 13 O eme go fitlhela baba ba gagwe ba dirwa setilo sa dinao tsa gagwe. \v 14 Gonne ka moneelo o le mongwe o dirile boitekanelo botlhe ba ba itshepisitsweng go ya bosakhutleng.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/10/15.txt b/10/15.txt
index b2297d0..3db4912 100644
--- a/10/15.txt
+++ b/10/15.txt
@@ -1 +1,5 @@
-\v 15 Moya o o boitshepo le one o a re pakela. Lantlha ware, \v 16 ´´Mo ke kgolagano e ke tlaa e dirang le bone morago ga  malatsi ao, go bua Modimo ke tlaa baya melao yame mo dipelong tsa bone gape ketlaa di kwala mo ditlhaloganyong tsa bone.
\ No newline at end of file
+<<<<<<< HEAD
+\v 15 Moya o o boitshepo le one o a re pakela. Lantlha ware, \v 16 ´´Mo ke kgolagano e ke tlaa e dirang le bone morago ga  malatsi ao, go bua Modimo ke tlaa baya melao yame mo dipelong tsa bone gape ketlaa di kwala mo ditlhaloganyong tsa bone.
+=======
+\v 15 Moya o o boitshepo le one o a re pakela. La ntlha wa re, \v 16 ''Mo ke kgolagano e ke tla a e dirang le bone morago ga  malatsi ao, go bua Morena. Ke tla a baya melao yame mo dipelong tsa bone, gape ke tla a e kwala mo ditlhaloganyong tsa bone.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/10/17.txt b/10/17.txt
index 7b00bbe..7be8446 100644
--- a/10/17.txt
+++ b/10/17.txt
@@ -1 +1,5 @@
-\v 17 Mme maleo a bone le bosula jwa bone ga nkitla ke di gakologelwa.´´  \v 18  Mme jaanong kwa boitshwarelo jwa tsone boleng teng gago tlhole go na le setlhabelo ka ntlha ya boleo.
\ No newline at end of file
+<<<<<<< HEAD
+\v 17 Mme maleo a bone le bosula jwa bone ga nkitla ke di gakologelwa.´´  \v 18  Mme jaanong kwa boitshwarelo jwa tsone boleng teng gago tlhole go na le setlhabelo ka ntlha ya boleo.
+=======
+\v 17 Mme maleo a bone le maikepo a bone ga nkitla ke di gakologelwa.'' \v 18  Mme jaanong kwa boitshwarelo jwa tsone boleng teng, gago tlhole go na le setlhabelo ka ntlha ya boleo.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/10/19.txt b/10/19.txt
index 700a3d0..ad12757 100644
--- a/10/19.txt
+++ b/10/19.txt
@@ -1 +1,5 @@
-\v 19 Jaanong, bakaulengwe, re na le go tlhoka poifo go tsena mo lefelong lele boitshepo ka madi a Jeso. \v 20 E o ke yone tsela e ntsha ya go tshela e a  re e buletseng sesiro, ke ka nama ya gagwe. \v 21 Ka gore re na le moperesite o mogolo mo godimo  ga ntlo ya Modimo, \v 22  a re tseneng ka dipelo tse di boammaruri ka botlalo jwa tlhomamisa ya tumelo, re nale dipelo tsedi tlhatswitsweng mo letswalong le le bosulo mebele ya rona e tlhatswitswe ka metsi a a itshekileng.
\ No newline at end of file
+<<<<<<< HEAD
+\v 19 Jaanong, bakaulengwe, re na le go tlhoka poifo go tsena mo lefelong lele boitshepo ka madi a Jeso. \v 20 E o ke yone tsela e ntsha ya go tshela e a  re e buletseng sesiro, ke ka nama ya gagwe. \v 21 Ka gore re na le moperesite o mogolo mo godimo  ga ntlo ya Modimo, \v 22  a re tseneng ka dipelo tse di boammaruri ka botlalo jwa tlhomamisa ya tumelo, re nale dipelo tsedi tlhatswitsweng mo letswalong le le bosulo mebele ya rona e tlhatswitswe ka metsi a a itshekileng.
+=======
+\v 19 Jaanong, bakaulengwe, re na le botlhokapoifo go tsena mo lefelong lele boitshepo ja boitshepo ka madi a Jeso. \v 20 E o ke tsela e ntsha ya go tshela e a  re buletseng sesiro ka yone, ke gore, ka nama ya gagwe. \v 21 Ka gore re na le moperesiti yo mogolo mo ntlong ya Modimo, \v 22  a re tseneng ka dipelo tse di boammaaruri ka botlalo jwa tlhomamiso ya tumelo, re na le dipelo tsedi tlhatswitsweng mo letswalong le le bosula mebele ya rona e tlhatswitswe ka metsi a a itshekileng.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/10/23.txt b/10/23.txt
index 65a5fd1..da9d961 100644
--- a/10/23.txt
+++ b/10/23.txt
@@ -1 +1,5 @@
-\v 23 A rotlhe re tshwaraganeng  thata mo boipolelong jo bo solofetsweng, ntle le go kgarakgatshegaka, ka gore Modimo yo o re solofeditseng, o boikanyego.  \v 24 A re lebeleleng go kgothatsanya  ka go rata le  ka ditiro tse dintle. \v 25 A re seka ra emisa go kopana jaaka ba bangwe ba dirile. Ka jalo, are kgothatsaneng kgapetsakgapetsa, jaaka re bona letsatsi le atamela.
\ No newline at end of file
+<<<<<<< HEAD
+\v 23 A rotlhe re tshwaraganeng  thata mo boipolelong jo bo solofetsweng, ntle le go kgarakgatshegaka, ka gore Modimo yo o re solofeditseng, o boikanyego.  \v 24 A re lebeleleng go kgothatsanya  ka go rata le  ka ditiro tse dintle. \v 25 A re seka ra emisa go kopana jaaka ba bangwe ba dirile. Ka jalo, are kgothatsaneng kgapetsakgapetsa, jaaka re bona letsatsi le atamela.
+=======
+\v 23 A re tshwareng ka thata boipolelo jwa tsholofelo ya rona, ntle le go reketla, ka gore Modimo yo o re solofeditseng, o boikanyego. \v 24 A re lebeleleng ka fa re ka kgothatsanyang  ka teng mo leratong le ditiro tse molemo. \v 25 A re seka ra emisa go kopana jaaka ba bangwe ba dirile. Ka jalo, a re kgothatsaneng kgapetsakgapetsa, jaaka re bona letsatsi le atamela.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/10/26.txt b/10/26.txt
index 747dac8..7e2f720 100644
--- a/10/26.txt
+++ b/10/26.txt
@@ -1 +1,5 @@
-\v 26 Fela jaaka re tlaa be re tsenelela mo sebeng ka bomo  jaaka re amogetse kitso ya nnete, setlhabelo sa maleo ga se bonale. \v 27 Ka jalo,  go nale tsholofelo ya poifo ya katlholo, le bokete jwa molelo yoo tlaa ganyaolang baba ba Modimo.
\ No newline at end of file
+<<<<<<< HEAD
+\v 26 Fela jaaka re tlaa be re tsenelela mo sebeng ka bomo  jaaka re amogetse kitso ya nnete, setlhabelo sa maleo ga se bonale. \v 27 Ka jalo,  go nale tsholofelo ya poifo ya katlholo, le bokete jwa molelo yoo tlaa ganyaolang baba ba Modimo.
+=======
+\v 26 Gonne fa re ka tswelela re leofa kabomo morago ga go amogela kitso ya boammaaruri, setlhabelo se se ntshediwang maleo ga se tlhole se le teng. \v 27 Boemong ja moo, go na le tsholofelo e e boifisang ya katlholo, le bogale jwa molelo o o tla a nyeletsang baba ba Modimo.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/10/28.txt b/10/28.txt
index d1da247..74abadb 100644
--- a/10/28.txt
+++ b/10/28.txt
@@ -1 +1,5 @@
-\v 28 Mongwe yoo ikgatholositseng molao waga Moshe o swa ntle le mautlwelobotlhoko a mapaki a mabedi kgotsa a mararo a basupi. \v 29 O akanya gore o tlhoka katlholo ee kanakang kafa tlase ga leoto la ngwana wa Modimo yoo tshwarang madi a  kgolagano aa sa itshekologang, ka madi a a itshepisitsweng, ka one mme a tlhapatsa mowa wa tshegofatso?
\ No newline at end of file
+<<<<<<< HEAD
+\v 28 Mongwe yoo ikgatholositseng molao waga Moshe o swa ntle le mautlwelobotlhoko a mapaki a mabedi kgotsa a mararo a basupi. \v 29 O akanya gore o tlhoka katlholo ee kanakang kafa tlase ga leoto la ngwana wa Modimo yoo tshwarang madi a  kgolagano aa sa itshekologang, ka madi a a itshepisitsweng, ka one mme a tlhapatsa mowa wa tshegofatso?
+=======
+\v 28 Ope yo o ganang molao wa ga Moshe o swa ntle le mautlwelobotlhoko ka bosupi jwa batho ba le babedi kgotsa bararo. \v 29 O akanya gore katlholo e ka nna bokete go le kae mo go ene yo o gatang Morwa Modimo ka dinao, yo o tshwarang madi a kgolagano jaaka ekete ga a boitshepo, madi a ka one a ntlafaditsweng, mme a tlhapatsa Moya wa tshegofatso?
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/10/30.txt b/10/30.txt
index bf7723a..ba85e93 100644
--- a/10/30.txt
+++ b/10/30.txt
@@ -1 +1,5 @@
-\v 30 Ka re a itse yoo rileng, ''ipusolosetso ke yame; ke tlaa go duela gape.'' Ebile gape, ''Modimo o tlaa atlhola batho ba gagwe.'' \v 31 Ke selo sese boifisang go wela mo diatleng tsa Modimo yoo tshelang!
\ No newline at end of file
+<<<<<<< HEAD
+\v 30 Ka re a itse yoo rileng, ''ipusolosetso ke yame; ke tlaa go duela gape.'' Ebile gape, ''Modimo o tlaa atlhola batho ba gagwe.'' \v 31 Ke selo sese boifisang go wela mo diatleng tsa Modimo yoo tshelang!
+=======
+\v 30 Gonne re itse yo o rileng, ''Ipusolosetso ke yame; ke tlaa busolosa.'' Gape, ''Modimo o tla a atlhola batho ba gagwe.'' \v 31 Ke selo se se boitshegang go wela mo diatleng tsa Modimo yo o tshelang!
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/10/32.txt b/10/32.txt
index 7c7ad09..488ab27 100644
--- a/10/32.txt
+++ b/10/32.txt
@@ -1 +1,5 @@
-\v 32 Mme gakologelwa malatsi a a fitileng, fa o sena go sedimosediwa, ka fa o neng o itshokile ka teng pogisego e kgolo. \v 33 O ne wa tlhabisiwa ditlhong fa gare ga batho ka matlhapa le pogisego, mme le ne le  boga le ba ba raletseng pogisego eo. \v 34 Le ne la tlhomogela pelo ba ba neng ba le magolegwa, mme o ne wa itumela ba go tseela mahumo a gago. Ka o ne o itse fa o na le mahumo a a botoka a a sa kutleng.
\ No newline at end of file
+<<<<<<< HEAD
+\v 32 Mme gakologelwa malatsi a a fitileng, fa o sena go sedimosediwa, ka fa o neng o itshokile ka teng pogisego e kgolo. \v 33 O ne wa tlhabisiwa ditlhong fa gare ga batho ka matlhapa le pogisego, mme le ne le  boga le ba ba raletseng pogisego eo. \v 34 Le ne la tlhomogela pelo ba ba neng ba le magolegwa, mme o ne wa itumela ba go tseela mahumo a gago. Ka o ne o itse fa o na le mahumo a a botoka a a sa kutleng.
+=======
+\v 32 Mme gakologelwang matsatsi a a fetileng, fa le sena go sedimosediwa, ka fa le neng la itshokela go kgaratlha mo go golo mo pogisegong . \v 33 Le ne la jewa setshego fa gare ga batho ka matlhapa le tlhokofatso, mme le ne le kopanetse se le ba ba raletseng pogisego eo. \v 34 Le ne la tlhomogela pelo ba ba neng ba le magolegwa la ba la amogela go tseelwa dithoto ka boitumelo. Le ne le itse fa le na le dithoto tse di botoka tse di sa khutleng.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/10/35.txt b/10/35.txt
index fbe9ebe..38d6498 100644
--- a/10/35.txt
+++ b/10/35.txt
@@ -1 +1,5 @@
-\v 35 Jaanong o seka wa latlha botlhoka poifo jwa ga gago, ka gore go na le tuelo e kgolo. \v 36 O tlhokana le go nna pelo telele, gore o tle o amogele se Modimo a se solofeditseng, morago o sena go dira thato ya gagwe. \v 37 ''Gonne mo sebakeng se se khutshwane, ene yoo tlaa tlang, o tla atla  mme ga a nke a diega.
\ No newline at end of file
+<<<<<<< HEAD
+\v 35 Jaanong o seka wa latlha botlhoka poifo jwa ga gago, ka gore go na le tuelo e kgolo. \v 36 O tlhokana le go nna pelo telele, gore o tle o amogele se Modimo a se solofeditseng, morago o sena go dira thato ya gagwe. \v 37 ''Gonne mo sebakeng se se khutshwane, ene yoo tlaa tlang, o tla atla  mme ga a nke a diega.
+=======
+\v 35 Jaanong se latlheng botlhoka poifo jwa lona, jo bo nang le tuelo e kgolo. \v 36 le tlhoka bopelotelele, gore le tle le amogele se Modimo a se solofeditseng, morago fa le sena go dira thato ya gagwe. \v 37 ''Gonne ka bonako, ene yo o tlaa tlang, o tla tla  mme ga a nke a diega.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/10/38.txt b/10/38.txt
index dc7c00f..9ed1c2a 100644
--- a/10/38.txt
+++ b/10/38.txt
@@ -1 +1,5 @@
-\v 38 Basiami ba me ba tlaa tshela ka tumelo, fa a leba ko morago, Ke tla a seke ke mo itumedise.'' \v 39 Mme gare ba o baba ko morago ba boela tshenyegong. Le fa gontse jalo,  re bangwe  baba nang le tumelo go boloka mewa ya rona.
\ No newline at end of file
+<<<<<<< HEAD
+\v 38 Basiami ba me ba tlaa tshela ka tumelo, fa a leba ko morago, Ke tla a seke ke mo itumedise.'' \v 39 Mme gare ba o baba ko morago ba boela tshenyegong. Le fa gontse jalo,  re bangwe  baba nang le tumelo go boloka mewa ya rona.
+=======
+\v 38 Mosiami wame o tla a tshela ka tumelo.Fa a leba kwa morago, ke tla a seke ke mo itumelele.'' \v 39 Mme ga re bao ba ba boelang tshenyegong. Boemong jwa moo,  re bangwe  ba ba nang le tumelo go boloka mewa ya rona.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/11/01.txt b/11/01.txt
index b1ca752..67f63c5 100644
--- a/11/01.txt
+++ b/11/01.txt
@@ -1 +1,5 @@
-\c 11 \v 1 Jaanong tumelo ke tlhomamiso ka dilo tse di fitlhegileng tsa tsholofetso.Ke bosupi ka ga ditiragalo tse di sa bonweng.  \v 2 Ka ga se,borraaronamogolo ba rurifaditswe ke tumelo ya bone.  \v 3 Ka tumelo re tlhaloganya gore lebopo le tlhodilwe ka taolo ya  Modimo gore se se bonalang se seka sa dirwa ka dilo tse di bonalang.
\ No newline at end of file
+<<<<<<< HEAD
+\c 11 \v 1 Jaanong tumelo ke tlhomamiso ka dilo tse di fitlhegileng tsa tsholofetso.Ke bosupi ka ga ditiragalo tse di sa bonweng.  \v 2 Ka ga se,borraaronamogolo ba rurifaditswe ke tumelo ya bone.  \v 3 Ka tumelo re tlhaloganya gore lebopo le tlhodilwe ka taolo ya  Modimo gore se se bonalang se seka sa dirwa ka dilo tse di bonalang.
+=======
+\c 11 \v 1 Jaanong tumelo ke tlhomamiso ka dilo tse di solofetsweng ka bosenapelaelo. Ke bosupi ka ga ditiragalo tse di iseng di bonwe. \v 2 Gonne ka ntlha ya se, borraaronamogolo ba amogelesegile ka lebaka la tumelo ya bone. \v 3 Ka tumelo re tlhaloganya gore lebopo le tlhodilwe ka taolo ya  Modimo gore se se bonalang se be se sa dirwa ka dilo tse di neng di bonala.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/11/04.txt b/11/04.txt
index 3e1d099..da07a83 100644
--- a/11/04.txt
+++ b/11/04.txt
@@ -1 +1,5 @@
-\v 4 E ne e le ka tumela gore Abele a ntshetse modimo setlhabelo se se botoka mo go sa ga Kaene,ka se, o ne a tlhomamisiwa a le  tshiamo gape Modimo a bua sentle ka ga setlhabelo sa gagwe,mme ka tumelo Abele o ntse o a bua le fa a sule.
\ No newline at end of file
+<<<<<<< HEAD
+\v 4 E ne e le ka tumela gore Abele a ntshetse modimo setlhabelo se se botoka mo go sa ga Kaene,ka se, o ne a tlhomamisiwa a le  tshiamo gape Modimo a bua sentle ka ga setlhabelo sa gagwe,mme ka tumelo Abele o ntse o a bua le fa a sule.
+=======
+\v 4 E ne e le ka tumelo gore Abele a ntshetse Modimo setlhabelo se se botoka mo go sa ga Kaene, ka se, o ne a kaiwa a le tshiamo, mme Modimo a bua sentle ka ga gagwe ka ntlha ya setlhabelo sa gagwe, mme ka tumelo Abele o santse a bua le fa a sule.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/11/05.txt b/11/05.txt
index fb3bef9..67cc269 100644
--- a/11/05.txt
+++ b/11/05.txt
@@ -1 +1,5 @@
-\v 5  E  ne e le ka tumelo gore Enoko a tseelwe ko godimo gore a seka a bona loso la gagwe.'' O ne a seka a bonwa ka gore Modimo o ne a mo tsere.''Gonne pele ga a tsewa go ne go rurifaditswe gore o itumedisitse Modimo.   \v 6 Jaanong ko ntle ga tumelo ga go kgonafale go mo itumedisa,gonne go tlhokafala gore  mongwe le mongwe oo tlang mo Modimong o tshwanetse gore a dumele gore o teng gape gore ke Ene o o tla a duelang ba ba mmatlang.
\ No newline at end of file
+<<<<<<< HEAD
+\v 5  E  ne e le ka tumelo gore Enoko a tseelwe ko godimo gore a seka a bona loso la gagwe.'' O ne a seka a bonwa ka gore Modimo o ne a mo tsere.''Gonne pele ga a tsewa go ne go rurifaditswe gore o itumedisitse Modimo.   \v 6 Jaanong ko ntle ga tumelo ga go kgonafale go mo itumedisa,gonne go tlhokafala gore  mongwe le mongwe oo tlang mo Modimong o tshwanetse gore a dumele gore o teng gape gore ke Ene o o tla a duelang ba ba mmatlang.
+=======
+\v 5  E  ne e le ka tumelo gore Enoke a tseelwe kwa godimo gore a seka a bona loso la gagwe.'' O ne a seka a bonwa ka gore Modimo o ne a mo tsere.''Gonne pele ga a tsewa go ne go rurifaditswe gore o itumedisitse Modimo. \v 6 Jaanong ko ntle ga tumelo ga go kgonafale go mo itumedisa, gonne go tlhokafala gore  mongwe le mongwe yo o tlang mo Modimong o tshwanetse gore a dumele gore o teng gape gore ke moduedi wa ba ba mmatlang.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/11/07.txt b/11/07.txt
index 66f5e9a..1357221 100644
--- a/11/07.txt
+++ b/11/07.txt
@@ -1 +1,5 @@
-\v 7 E ne e le ka tumelo gore Noa a neelwe molaetsa wa Modimo ka ga dilo tse di ise di bonale,ka go lemoga Modimo a aga areka go boloka ba ntlo ya gagwe,ka go dira jalo a gana lefatshe mme a nna moja boswa wa tshiamo ka ntlha ya tumelo.
\ No newline at end of file
+<<<<<<< HEAD
+\v 7 E ne e le ka tumelo gore Noa a neelwe molaetsa wa Modimo ka ga dilo tse di ise di bonale,ka go lemoga Modimo a aga areka go boloka ba ntlo ya gagwe,ka go dira jalo a gana lefatshe mme a nna moja boswa wa tshiamo ka ntlha ya tumelo.
+=======
+\v 7 E ne e le ka tumelo gore Noa a neelwe molaetsa wa Modimo ka ga dilo tse di iseng di bonale, ka boifa Modimo a aga areka go boloka ba ntlo ya gagwe. Ka go dira jalo, a sekisa lefatshe mme a nna moja boswa wa tshiamo ka ntlha ya tumelo.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/11/08.txt b/11/08.txt
index 9a2c7bc..a5b96fa 100644
--- a/11/08.txt
+++ b/11/08.txt
@@ -1 +1,5 @@
-\v 8 E ne e le ka tumelo gore Aberehama, fa ane a bidiwa ,a obamela mme a tswa mo lefelong le a neng a tshwanetse go le amogela  go le rua boswa,a tswela ko ntle a sa itse gore o ya kae.  \v 9 E ne e le ka tumelo gore a tshele jaaka motshabi mo le fatsheng la tsholofetso,o ne a nna mo motlaaganeng le Isake le Jakoba,bajaboswa mmogo ba tsholofetso. \v 10 Gonne o ne a lebeletse toropo ee nang le metheo, toropo e   motshwantshi le moagi wa yone e tla a nna Modimo.
\ No newline at end of file
+<<<<<<< HEAD
+\v 8 E ne e le ka tumelo gore Aberehama, fa ane a bidiwa ,a obamela mme a tswa mo lefelong le a neng a tshwanetse go le amogela  go le rua boswa,a tswela ko ntle a sa itse gore o ya kae.  \v 9 E ne e le ka tumelo gore a tshele jaaka motshabi mo le fatsheng la tsholofetso,o ne a nna mo motlaaganeng le Isake le Jakoba,bajaboswa mmogo ba tsholofetso. \v 10 Gonne o ne a lebeletse toropo ee nang le metheo, toropo e   motshwantshi le moagi wa yone e tla a nna Modimo.
+=======
+\v 8 E ne e le ka tumelo gore Aborahama, fa a ne a bidiwa , a utlwa mme a ya kwa lefatsheng le a neng a tshwanetse go le amogela e le  boswa. A tswa, a sa itse gore o ya kae. \v 9 E ne e le ka tumelo gore a bo a tshedile jaaka motswakwa mo le fatsheng la tsholofetso. O ne a nna mo tanteng le Isake le Jakoba, bajaboswa mmogo ba tsholofetso. \v 10 Gonne o ne a lebeletse pele motse o o nang le metheo, motse o   motshwantshi le moagi wa one e tla a nnang Modimo.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/11/11.txt b/11/11.txt
index 607e52a..cdaaae1 100644
--- a/11/11.txt
+++ b/11/11.txt
@@ -1 +1,5 @@
-\v 11 E ne e le ka tumelo, le fa Sara  ka bo ene a ne a le moopa,gore Aberehame a nne le thata go tlhokomela ngwana.Se se diragetse le fa a ntse a godile,gonne o ne a lemogilwe a ikanyega yo o neetsweng tsholofetso.  \v 12 Jalo he,go tswa mo monneng a le mongwe oo neng a sule go tshotswe ba ba tshwanang le dinaledi mo legodimong ba bontsi jwa bone bo tshwanang le di tlhaka tsa motlhaba go bapa  le lewatle oo sa balegeng.
\ No newline at end of file
+<<<<<<< HEAD
+\v 11 E ne e le ka tumelo, le fa Sara  ka bo ene a ne a le moopa,gore Aberehame a nne le thata go tlhokomela ngwana.Se se diragetse le fa a ntse a godile,gonne o ne a lemogilwe a ikanyega yo o neetsweng tsholofetso.  \v 12 Jalo he,go tswa mo monneng a le mongwe oo neng a sule go tshotswe ba ba tshwanang le dinaledi mo legodimong ba bontsi jwa bone bo tshwanang le di tlhaka tsa motlhaba go bapa  le lewatle oo sa balegeng.
+=======
+\v 11 E ne e le ka tumelo, le fa Sara a ne a le moopa,gore Aberehame a nne le bokgoni jwa go nna le   ngwana.Se se diragetse le fa  a ne  a godile thata,gonne o ne a kaile yo o neetseng tsholofetso a ikanyega. \v 12 Jalo he,go tswa mo monneng a le mongwe yo o neng a lebega a sule, go tshotswe ba ba tshwanang le dinaledi mo legodimong ba bontsi jwa bone bo tshwanang le ditlhaka tsa motlhaba go bapa  le lewatle, o o sa balegeng.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/11/13.txt b/11/13.txt
index b379f49..1fdd077 100644
--- a/11/13.txt
+++ b/11/13.txt
@@ -1 +1,5 @@
-\v 13 E ne e le mo tumelong gore tsotlhe tse di swe di sa amogela tsholofetso,jalo he morago ga go ba bona le go dumedisa ba ba kgakala,ba dumela gore ke baeng le bajaki mo lefatshing.  \v 14 Mo go ba ba buang dilo tse,go supafala gore ba batla legae la bone
\ No newline at end of file
+<<<<<<< HEAD
+\v 13 E ne e le mo tumelong gore tsotlhe tse di swe di sa amogela tsholofetso,jalo he morago ga go ba bona le go dumedisa ba ba kgakala,ba dumela gore ke baeng le bajaki mo lefatshing.  \v 14 Mo go ba ba buang dilo tse,go supafala gore ba batla legae la bone
+=======
+\v 13 E ne e le mo tumelong gore tsotlhe tse di swe di sa amogela tsholofetso. Jalo he, morago ga go ba bona le go dumedisa ba ba kgakala,ba dumela gore ke batswakwa le batshabi mo lefatshing. \v 14 Gonne ba ba buang dilo tse, ba bontsha fa ba batla legae.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/11/15.txt b/11/15.txt
index 22700c9..a451c6c 100644
--- a/11/15.txt
+++ b/11/15.txt
@@ -1 +1,5 @@
-\v 15 Fa ba akanya ka lefatshe le ba tswang ko go lone,ba ne ba ka nna le tshono ya go boela teng. \v 16 Le fa go ntse jalo ba eletsa lefatshe le le botoka le eleng la Selegodimo.Le fa go ntse jalo Modimo ga a tlhabiwe ke ditlhong go bidiwa Modimo wa bone gonne o ba baakanyeditse legae.
\ No newline at end of file
+<<<<<<< HEAD
+\v 15 Fa ba akanya ka lefatshe le ba tswang ko go lone,ba ne ba ka nna le tshono ya go boela teng. \v 16 Le fa go ntse jalo ba eletsa lefatshe le le botoka le eleng la Selegodimo.Le fa go ntse jalo Modimo ga a tlhabiwe ke ditlhong go bidiwa Modimo wa bone gonne o ba baakanyeditse legae.
+=======
+\v 15 Fa ba ne ba akanya ka lefatshe le ba tswang kwa go lone,ba ka bo ba nnile le sebaka sa go boa. \v 16 Mme ka fa go ntseng ka teng, ba eletsa lefatshe le le botoka, eleng la selegodimo.Ka jalo Modimo ga a tlhabiwe ke ditlhong go bidiwa Modimo wa bone gonne o ba baakanyeditse motse.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/11/17.txt b/11/17.txt
index 6ac8c3a..7d18a00 100644
--- a/11/17.txt
+++ b/11/17.txt
@@ -1 +1,5 @@
-\v 17 E ne e le ka tumelo gore Aberehama,fa a lekwa go neela Isake,E ne e le  morwa wa gagwe o o nosi a mo neetseng,ene o a amogetseng tsholofetso.  \v 18 E ne e le Aberahame yo go neng go buiwa ka ene.E ne e le ka Isake gore bana ba lona ba  bidiwe. \v 19 Aberehama a fa lebaka la gore Modimo o tla a tsosa Isake mo baswing le ka go bua ka tlhomamiso e ne e tswa ko bone go mo amogela gape.
\ No newline at end of file
+<<<<<<< HEAD
+\v 17 E ne e le ka tumelo gore Aberehama,fa a lekwa go neela Isake,E ne e le  morwa wa gagwe o o nosi a mo neetseng,ene o a amogetseng tsholofetso.  \v 18 E ne e le Aberahame yo go neng go buiwa ka ene.E ne e le ka Isake gore bana ba lona ba  bidiwe. \v 19 Aberehama a fa lebaka la gore Modimo o tla a tsosa Isake mo baswing le ka go bua ka tlhomamiso e ne e tswa ko bone go mo amogela gape.
+=======
+\v 17 E ne e le ka tumelo fa Aberehama,fa a lekwa, a neela Isake, E ne e le  morwa wa gagwe yo o nosi yo a mo neetseng,ene yo o amogetseng ditsholofetso. \v 18 E ne e le Aberahama yo go neng go buiwa le ene gotwe,  ''Dikokomane tsa gago di tlaa bidiwa ka Isake. \v 19 Aborehama a ipolelela gore Modimo o kgona go tsosa Isake mo baswing, go ka nna gatwe, o mo amogetse go tswa mo go bone.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/11/20.txt b/11/20.txt
index f32db6f..0b36de4 100644
--- a/11/20.txt
+++ b/11/20.txt
@@ -1 +1,5 @@
-\v 20 E ne e le ka tumelo ka ga dilo tse di tlang tsa gore Isake a segofatse Jakoba le Esau.  \v 21 E ne e le ka tumelo gore Jakobe fa a swa a segofatse bana ba ga Josefa,Jakoba a obamela a ikaegile mo godimo ga thobane ya gagwe. \v 22 Ene e le ka tumelo gore Josefa e re bokhutlo jwa gagwe bo atametse, a bua ka go tsamaya ga bana ba Iseraele go tswa ko Egepeto mme a ba laela ka marapo a gagwe.
\ No newline at end of file
+<<<<<<< HEAD
+\v 20 E ne e le ka tumelo ka ga dilo tse di tlang tsa gore Isake a segofatse Jakoba le Esau.  \v 21 E ne e le ka tumelo gore Jakobe fa a swa a segofatse bana ba ga Josefa,Jakoba a obamela a ikaegile mo godimo ga thobane ya gagwe. \v 22 Ene e le ka tumelo gore Josefa e re bokhutlo jwa gagwe bo atametse, a bua ka go tsamaya ga bana ba Iseraele go tswa ko Egepeto mme a ba laela ka marapo a gagwe.
+=======
+\v 20 E ne e ntse e le ka tumelo ka ga dilo tse di tlang gore Isake a segofatse Jakoba le Esau. \v 21 E ne e le ka tumelo gore Jakobe fa a swa a segofatse barwa Josefa, Jakoba a obamela a ikaegile mo godimo ga thobane ya gagwe. \v 22 Ene e le ka tumelo gore Josefa fa bokhutlo jwa gagwe bo atametse, a bua ka go tswa ga bana ba Iseraele kwa Egepeto mme a ba laela ka marapo a gagwe.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/11/23.txt b/11/23.txt
index dc33c6e..6eca75b 100644
--- a/11/23.txt
+++ b/11/23.txt
@@ -1 +1,5 @@
-\v 23 E ne e le ka tumelo gore Moshe,fa a tsholwa,a fitlhwa kgwedi tse tharo ke batsadi ba gagwe ka ba ne ba bona fa e le ngwana o montle.Ba ne ba sa  tshabe taolo ya kgosi.  \v 24 E ne e le ka tumelo gore Moshe fa  a sena go gola a gana go bidiwa morwa wa morwadia Faro.  \v 25 Mme jalo a ikgethela go bidiwa go sotlega le bana ba Iseraele go na le go ja monate wa nakwana wa sebe.  \v 26 O ne a dumalana gore matlhabisa ditlhong a go sala keresete morago a nonofile go na le mahumo a Egepeto.Gonne o ne a baakanyetsa matlho a gagwe poelo.
\ No newline at end of file
+<<<<<<< HEAD
+\v 23 E ne e le ka tumelo gore Moshe,fa a tsholwa,a fitlhwa kgwedi tse tharo ke batsadi ba gagwe ka ba ne ba bona fa e le ngwana o montle.Ba ne ba sa  tshabe taolo ya kgosi.  \v 24 E ne e le ka tumelo gore Moshe fa  a sena go gola a gana go bidiwa morwa wa morwadia Faro.  \v 25 Mme jalo a ikgethela go bidiwa go sotlega le bana ba Iseraele go na le go ja monate wa nakwana wa sebe.  \v 26 O ne a dumalana gore matlhabisa ditlhong a go sala keresete morago a nonofile go na le mahumo a Egepeto.Gonne o ne a baakanyetsa matlho a gagwe poelo.
+=======
+\v 23 E ne e le ka tumelo gore Moshe,fa a sena go tsholwa, a fitlhwa dikgwedi tse tharo ke batsadi ba gagwe ka ba ne ba bona fa e le ngwana yo montle. Ba ne ba sa  tshabe taolo ya kgosi. \v 24 E ne e le ka tumelo gore Moshe fa  a sena go gola a gana go bidiwa morwa wa morwadia Faro. \v 25 Boemong ja moo, a ikgethela go sotlega le bana ba Iseraele go na le go ja monate wa nakwana wa boleo. \v 26 O ne a ipolelela gore go rolega seriti sa go sala Keresete morago e ne e le dikhumo tse dikgolo go feta matlotlo a Egepeto.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/11/27.txt b/11/27.txt
index 738cde3..a38044f 100644
--- a/11/27.txt
+++ b/11/27.txt
@@ -1 +1,5 @@
-\v 27 E ne e le ka tumelo gore Moshe a tlogele Egepeto,O ne a seka a tshaba tshakgalo ya kgosi gonne o ne a itshokile jaaka e kare o ne a  bona ene o o sa bonaleng.  \v 28 E ne e le ka tumelo gore a tshegetse moletlo wa tlolaganyo le go kgatshiwa ga madi,gore mosinyi o o bolaang bana ba ntlha a seka a ama bana ba ntlha ba basimane  ba Iseraele.
\ No newline at end of file
+<<<<<<< HEAD
+\v 27 E ne e le ka tumelo gore Moshe a tlogele Egepeto,O ne a seka a tshaba tshakgalo ya kgosi gonne o ne a itshokile jaaka e kare o ne a  bona ene o o sa bonaleng.  \v 28 E ne e le ka tumelo gore a tshegetse moletlo wa tlolaganyo le go kgatshiwa ga madi,gore mosinyi o o bolaang bana ba ntlha a seka a ama bana ba ntlha ba basimane  ba Iseraele.
+=======
+\v 27 E ne e le ka tumelo gore Moshe a tlogele Egepeto. O ne a seka a tshaba tshakgalo ya kgosi gonne o ne a itshokile jaaka e kare o ne a  bona ene yo o sa bonaleng. \v 28 E ne e le ka tumelo gore a tshegetse moletlo wa tlolaganyo le go kgatshiwa ga madi,gore mosinyi yo o bolaang bana ba ntlha a seka a ama bana ba ntlha ba basimane  ba Iseraele.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/11/29.txt b/11/29.txt
index acf006a..3dfa51c 100644
--- a/11/29.txt
+++ b/11/29.txt
@@ -1 +1,5 @@
-\v 29 E ne e le ka tumelo gore ba kgabaganye lewatle le lehibidu jaaka e ne e le lefatshe la komelelo.E rile baegepeto ba leka go dira se,ba komediwa.  \v 30 E ne e le ka tumelo gore dipota tsa Jeriko di wele fa fatshe morago ga di dikologa ga supa. \v 31 E ne e le ka tumelo gore Rahabe wa seaka a seka a swa le ba ba neng  ba sena kutlo ka gore o ne a amogela ditlhola ka kagiso.
\ No newline at end of file
+<<<<<<< HEAD
+\v 29 E ne e le ka tumelo gore ba kgabaganye lewatle le lehibidu jaaka e ne e le lefatshe la komelelo.E rile baegepeto ba leka go dira se,ba komediwa.  \v 30 E ne e le ka tumelo gore dipota tsa Jeriko di wele fa fatshe morago ga di dikologa ga supa. \v 31 E ne e le ka tumelo gore Rahabe wa seaka a seka a swa le ba ba neng  ba sena kutlo ka gore o ne a amogela ditlhola ka kagiso.
+=======
+\v 29 E ne e le ka tumelo gore ba kgabaganye lewatle le le lehibidu jaaka ekete ke lefatshe le le omeletseng. E rile baegepeto ba leka go dira se,ba komediwa. \v 30 E ne e le ka tumelo gore dipota tsa Jeriko di wele fa fatshe morago ga go di dikologa malatsi a supa. \v 31 E ne e le ka tumelo gore Rahabe wa seaka a seka a swa le ba ba neng  ba sena kutlo ka gore o ne a amogela ditlhola ka kagiso.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/11/32.txt b/11/32.txt
index 860eb46..705e28b 100644
--- a/11/32.txt
+++ b/11/32.txt
@@ -1 +1,5 @@
-\v 32 Re ka bua re reng? nako e tla a mpalela fa nka bua ka Gidione,Baraka,SamosoneJefotha,Tafita,Samoele le ka ga baporofiti ba bangwe. \v 33 E ne e le ka ga tumelo gore magosi a fengwe,go bereka go sa gobelelwe le go amogela tsholofetso,ba emisa melomo ya ditau,  \v 34 ba tima nonofo ya molelo ba falola bogale jwa tshaka,ba fodisiwa malwetse,ba nna bagaka mo ntweng gape ba fenya dintwa tsa merafe e sele.
\ No newline at end of file
+<<<<<<< HEAD
+\v 32 Re ka bua re reng? nako e tla a mpalela fa nka bua ka Gidione,Baraka,SamosoneJefotha,Tafita,Samoele le ka ga baporofiti ba bangwe. \v 33 E ne e le ka ga tumelo gore magosi a fengwe,go bereka go sa gobelelwe le go amogela tsholofetso,ba emisa melomo ya ditau,  \v 34 ba tima nonofo ya molelo ba falola bogale jwa tshaka,ba fodisiwa malwetse,ba nna bagaka mo ntweng gape ba fenya dintwa tsa merafe e sele.
+=======
+\v 32 Ke ka bua eng go feta fa?  Nako e tla a mpalela fa nka bua ka Gidione,Baraka,SamesoneJefotha,Tafita,Samoele le ka ga baporofiti ba bangwe. \v 33 E ne e le ka tumelo gore ba bo ba fentse magosi,go dira go sa gobelelwe le go amogela tsholofetso.Ba tswala melomo ya ditau, \v 34 ba tima nonofo ya molelo, ba falola bogale jwa tshaka, ba fodisiwa malwetse, ba nna bagaka mo ntweng,  ba fenya mephato ya ntwa ya merafe e sele.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/11/35.txt b/11/35.txt
index 07a29e8..64b14aa 100644
--- a/11/35.txt
+++ b/11/35.txt
@@ -1 +1,5 @@
-\v 35 Basadi ba tla amogela baswi ba bone ka tsogo ya  baswi.Ba bangwe ba kgobotleditswe,ba sa amogele kgololo gore ba tle ba bone tsogo ya baswi e e botoka. \v 36 Ba bangwe ba lekilwe mo kgobotletsong le mo kiteong gape ba golegwa ba bo ba tlhatlhelwa ka kgolegelo.  \v 37 Ba kgobotlediwa ka mantswe,ba kgaogangwa ga bedi,ba bolawa ka tshaka,Ba apara matlalo a dinku le dipodi,e ne e le bahumanegi,ba gatelelwa,ba sa tsewe sentle. \v 38 Lefatshe le ne le sa ba siamela.Ba ne ba phatlaladiwa  mo sekakeng,mo dithabeng,mo dikgageng le mo mesimeng ya lefatshe.
\ No newline at end of file
+<<<<<<< HEAD
+\v 35 Basadi ba tla amogela baswi ba bone ka tsogo ya  baswi.Ba bangwe ba kgobotleditswe,ba sa amogele kgololo gore ba tle ba bone tsogo ya baswi e e botoka. \v 36 Ba bangwe ba lekilwe mo kgobotletsong le mo kiteong gape ba golegwa ba bo ba tlhatlhelwa ka kgolegelo.  \v 37 Ba kgobotlediwa ka mantswe,ba kgaogangwa ga bedi,ba bolawa ka tshaka,Ba apara matlalo a dinku le dipodi,e ne e le bahumanegi,ba gatelelwa,ba sa tsewe sentle. \v 38 Lefatshe le ne le sa ba siamela.Ba ne ba phatlaladiwa  mo sekakeng,mo dithabeng,mo dikgageng le mo mesimeng ya lefatshe.
+=======
+\v 35 Basadi ba amogela baswi ba bone ka tsogo ya  baswi.Ba bangwe ba bogisiwa, ba sa amogele kgololo gore ba tle ba bone tsogo ya baswi e e botoka. \v 36 Ba bangwe ba lekilwe mo go kgobobiweng le go titewa, le go golegwa ka dikeetane ba tsenngwa mo kgolegelong. \v 37 Ba kgobotlediwa ka matlapa. Ba kgaogangwa ga bedi ka shage.  Ba bolawa ka tshaka.  Ba apara matlalo a dihutshane. E ne e le batlhoki, ba gateletswe, ba sotlwa. \v 38 Lefatshe le ne le sa ba tshwanele. Ba ne ba kaila kaila mo dikgweng, mo dithabeng,mo dikgageng le mo mesimeng ya lefatshe.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/11/39.txt b/11/39.txt
index d91058e..374a4a3 100644
--- a/11/39.txt
+++ b/11/39.txt
@@ -1 +1,5 @@
-\v 39 Le fa go ntse jalo batho ba ne ba rurifaditswe ke Modimo ka ntlha ya tumelo ya bone ga ba a bona tsholofetso. \v 40 Modimo o re baakanyeditse sengwe se se botoka,gonne ko ntle ga rona ba ne ba ka seke ba dire tiro ee botoka.
\ No newline at end of file
+<<<<<<< HEAD
+\v 39 Le fa go ntse jalo batho ba ne ba rurifaditswe ke Modimo ka ntlha ya tumelo ya bone ga ba a bona tsholofetso. \v 40 Modimo o re baakanyeditse sengwe se se botoka,gonne ko ntle ga rona ba ne ba ka seke ba dire tiro ee botoka.
+=======
+\v 39 Le fa batho ba ne ba amogelesegile mo Modimong ka ntlha ya tumelo ya bone, ga ba aka ba amogela tsholofetso. \v 40 Modimo o re rulaganyditse sengwe se se botoka, gore kwa ntle ga rona, ba ne ba ka seke ba ntlafadiwe.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/12/01.txt b/12/01.txt
index b8199da..d047b44 100644
--- a/12/01.txt
+++ b/12/01.txt
@@ -1 +1,5 @@
-\c 12 \v 1 Fa go ntse jalo, ka re dikologilwe ke matshwititshwiti a basupi, a re beeleng kwa thoko merwalo e e re imelang le sebe se se re tshwarang motlhofo. A re tabogeng ka bopelotelele lebelo le re le beilweng pele. \v 2 A re tsepamiseng kelelelo ya rona mo go Keresete, mosimolodi le mowetsi wa tumelo ya rona. Ntateng ya boitumelo jo a neng a bo beilwe pele, One a itshokela mokgoro, a sa kgathalele ditlhong tsa one, a ya go nna ka ko letsogong le legolo la ga Rara kwa teroneng ya Modimo. \v 3 Ka jalo akanyang ka ene, yo aneng a itshokela kganetso e e neng etswa mo baleofing kgatlhanong le ene, gore le seka la lapa dipelo mme la ineela.
\ No newline at end of file
+<<<<<<< HEAD
+\c 12 \v 1 Fa go ntse jalo, ka re dikologilwe ke matshwititshwiti a basupi, a re beeleng kwa thoko merwalo e e re imelang le sebe se se re tshwarang motlhofo. A re tabogeng ka bopelotelele lebelo le re le beilweng pele. \v 2 A re tsepamiseng kelelelo ya rona mo go Keresete, mosimolodi le mowetsi wa tumelo ya rona. Ntateng ya boitumelo jo a neng a bo beilwe pele, One a itshokela mokgoro, a sa kgathalele ditlhong tsa one, a ya go nna ka ko letsogong le legolo la ga Rara kwa teroneng ya Modimo. \v 3 Ka jalo akanyang ka ene, yo aneng a itshokela kganetso e e neng etswa mo baleofing kgatlhanong le ene, gore le seka la lapa dipelo mme la ineela.
+=======
+\c 12 \v 1 Jalo he, ka re dikaganyeditswe ke bontsi jwa basupi, a re beeleng kwa thoko bokete bongwe le bongwe le boleo jo bo ka  re tswaketsang. A re tabogeng ka bopelotelele lebelo le re le beilweng pele. \v 2 A re tseeng Jeso tsia, mosimolodi le mmaakanyi wa tumelo. Ka lebaka la boitumelo jo a neng a bo beilwe pele, o ne a itshokela sefapaano, a nyatsa ditlhong tsa sone, a nna ka fa letsogong le legolo la setilo sa bogosi sa Modimo. \v 3 Ka jalo akanyang ka ene, yo a neng a itshokela kganetso e e neng etswa mo baleofing kgatlhanong le ene, gore le seka la lapa dipelo mme la ineela.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/12/04.txt b/12/04.txt
index f9e286a..d95a8ea 100644
--- a/12/04.txt
+++ b/12/04.txt
@@ -1 +1,5 @@
-\v 4 Ga le sike le ganetsane kgotsa go kgaratlha le sebe go fitlha mo le neng la tshololwa madi; \v 5 le lebetse kgothatso e e le laelang jaaka barwa e e reng: " Morwaaka, se tseye motlhofo kgalemo ya Morena, kana wa lapisega fa o kgalemelwa ke ene." \v 6 Gonne Morena o kgalema mongwe le mongwe yo a  mo ratang, le go otlhaya ba eleng barwa ba gagwe ba a ba amogelang.
\ No newline at end of file
+<<<<<<< HEAD
+\v 4 Ga le sike le ganetsane kgotsa go kgaratlha le sebe go fitlha mo le neng la tshololwa madi; \v 5 le lebetse kgothatso e e le laelang jaaka barwa e e reng: " Morwaaka, se tseye motlhofo kgalemo ya Morena, kana wa lapisega fa o kgalemelwa ke ene." \v 6 Gonne Morena o kgalema mongwe le mongwe yo a  mo ratang, le go otlhaya ba eleng barwa ba gagwe ba a ba amogelang.
+=======
+\v 4 Ga le ise le ganetsanye kgotsa go kgaratlha le boleo go fitlha mo le neng la tshololwa madi; \v 5 mme le lebetse kgothatso e e le laelang jaaka barwa: " Morwaaka, se tseye motlhofo kgalemo ya Morena, kana wa lapisega fa o kgalemelwa ke ene." \v 6 Gonne Morena o kgalema mongwe le mongwe yo a  mo ratang, le go otlhaya ba eleng barwa ba gagwe ba a ba amogelang.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/12/07.txt b/12/07.txt
index 302c8fb..05cfec9 100644
--- a/12/07.txt
+++ b/12/07.txt
@@ -1 +1,5 @@
-\v 7 Itsokeleng  pogisego jaaka kgalemo. Modimo o  le  tsaya  jaaka barwa ba gagwe. Gone ke ofe morwa yo rragwe a sekeng a mo mokgalema? \v 8 Mme fa oseke o kgalengwa, se e le se se diragalelang batho botlhe, itse gore o ngwana wa dikgora ga o morwa wa gagwe wa boammaaruri.
\ No newline at end of file
+<<<<<<< HEAD
+\v 7 Itsokeleng  pogisego jaaka kgalemo. Modimo o  le  tsaya  jaaka barwa ba gagwe. Gone ke ofe morwa yo rragwe a sekeng a mo mokgalema? \v 8 Mme fa oseke o kgalengwa, se e le se se diragalelang batho botlhe, itse gore o ngwana wa dikgora ga o morwa wa gagwe wa boammaaruri.
+=======
+\v 7 Itshokeleng tshotlego jaaka kgalemo. Modimo o dira le lona  jaaka barwa. Gonne ke ofe morwa yo rragwe a sa mo kgalemeng? \v 8 Mme fa o sa kgalemelwe, se e le se se diragalelang batho botlhe, itse gore ga o ngwana wa gagwe.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/12/09.txt b/12/09.txt
index 0cb5144..c45729c 100644
--- a/12/09.txt
+++ b/12/09.txt
@@ -1 +1,5 @@
-\v 9 Ebile gape, re na le bo rrarona ka fa senameng ba ba nnang ba re otlhaya, le gone re ne re ba tlotla. Jaanong ke eng re sare bogolo ra nna kutlo mo go Rara wa mewa yotlhe la tshela? \v 10 Gonne mo letsogong le lengwe, borrarona ba re otlhaile ka sebakanyana goyeng ka fa baneng ba bona go siame ka teng. Mme mo letsogong le lengwe Modimo o re  direla bomolemo, gore re tle re itse go nna ga mmogo le ene mo boitshepong jwa gagwe. \v 11 Ga gona kotlhao epe e e lebegang e le molemo ha e dirwa mo mothong, mme e nna botlhoko. Lefa gontse jalo e tla re ko morago e tsise maungo a kagiso a tshiamo mo go bao ba neng ba katisiwa ke yone.
\ No newline at end of file
+<<<<<<< HEAD
+\v 9 Ebile gape, re na le bo rrarona ka fa senameng ba ba nnang ba re otlhaya, le gone re ne re ba tlotla. Jaanong ke eng re sare bogolo ra nna kutlo mo go Rara wa mewa yotlhe la tshela? \v 10 Gonne mo letsogong le lengwe, borrarona ba re otlhaile ka sebakanyana goyeng ka fa baneng ba bona go siame ka teng. Mme mo letsogong le lengwe Modimo o re  direla bomolemo, gore re tle re itse go nna ga mmogo le ene mo boitshepong jwa gagwe. \v 11 Ga gona kotlhao epe e e lebegang e le molemo ha e dirwa mo mothong, mme e nna botlhoko. Lefa gontse jalo e tla re ko morago e tsise maungo a kagiso a tshiamo mo go bao ba neng ba katisiwa ke yone.
+=======
+\v 9 Mo godimo ga moo, re na le bo rrarona ka fa senameng ba ba nnang ba re kgalemela, le gone re ne re ba tlotla. Jaanong ke eng re sare bogolo ra nna kutlo mo go Rara wa mewa yotlhe ra tshela? \v 10 Gonne mo letsogong le lengwe, borrarona ba re kgalemile malatsi a se kae ka fa baneng ba bona go siame ka teng. Mme mo letsogong le lengwe Modimo o re  direla bomolemo, gore re tle re nne nae mo boitshepong jwa gagwe. \v 11 Ga gona kgalemo e e lebegang e siame, e nna botlhoko. Lefa gontse jalo e tla re ko morago e tsise maungo a kagiso ya tshiamo mo go bao ba neng ba katisiwa ke yone.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/12/12.txt b/12/12.txt
index dc2adce..e7d0a40 100644
--- a/12/12.txt
+++ b/12/12.txt
@@ -1 +1,5 @@
-\v 12 Ka jalo tlhatafatsang matsogo   le mangole a lona a a kgwetlhang. \v 13 Tlhamalatsang ditsela go baakanyetsa dikgatlo tsa lona, gore mo go bogole go seka ga go bala mme go fole.
\ No newline at end of file
+<<<<<<< HEAD
+\v 12 Ka jalo tlhatafatsang matsogo   le mangole a lona a a kgwetlhang. \v 13 Tlhamalatsang ditsela go baakanyetsa dikgatlo tsa lona, gore mo go bogole go seka ga go bala mme go fole.
+=======
+\v 12 Ka jalo tlhatafatsang matsogo a a lepeletseng le mangole a lona a a kgwetlhang. \v 13 Tlhamalaletsang maoto a lona ditsela, gore mo go bogole go seka ga gobala mme go fole.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/12/14.txt b/12/14.txt
index 30bd74e..84f540b 100644
--- a/12/14.txt
+++ b/12/14.txt
@@ -1 +1,5 @@
-\v 14 Batla kagiso le batho botlhe, le boitshepo jo e leng gore kwa ntle le jone go senang ope yo o ka bonang Morena. \v 15 Nnang kelotlhoko gore ope wa lona a se tlhaelwe ke tshegofatso ya Modimo, le gore go se nne modi ope wa go tshwara sekgopi o o ka golang go tsisa tlhakatlhakano, le gore bontsi bo seka ba leswafadiwa ke one. \v 16 Elang tlhoko gore a ga go na moleofi ope wa maleo a tlhakanelo dikobo kana yo a senang bomodimo jaaka Esau, yo a neng a rekisa botsalwapele jwa gagwe ka mogopo wa dijo. \v 17 Gonne le a itse gore morago ga se, erile a eletsa go rua tshegofatso, o ne a ganwa, ka gore o ne a tlhoka sebaka sa boikotlhao, le fa a ne a bo tsoma a lela ka dikeledi.
\ No newline at end of file
+<<<<<<< HEAD
+\v 14 Batla kagiso le batho botlhe, le boitshepo jo e leng gore kwa ntle le jone go senang ope yo o ka bonang Morena. \v 15 Nnang kelotlhoko gore ope wa lona a se tlhaelwe ke tshegofatso ya Modimo, le gore go se nne modi ope wa go tshwara sekgopi o o ka golang go tsisa tlhakatlhakano, le gore bontsi bo seka ba leswafadiwa ke one. \v 16 Elang tlhoko gore a ga go na moleofi ope wa maleo a tlhakanelo dikobo kana yo a senang bomodimo jaaka Esau, yo a neng a rekisa botsalwapele jwa gagwe ka mogopo wa dijo. \v 17 Gonne le a itse gore morago ga se, erile a eletsa go rua tshegofatso, o ne a ganwa, ka gore o ne a tlhoka sebaka sa boikotlhao, le fa a ne a bo tsoma a lela ka dikeledi.
+=======
+\v 14 Batla kagiso le batho botlhe, le boitshepo jo kwa ntle ga jone go senang ope yo o ka bonang Morena. \v 15 Nnang kelotlhoko gore ope wa lona a se tlhaelwe ke tshegofatso ya Modimo, le gore go se nne modi ope wa go tshwara sekgopi o o ka golang go tsisa bogalaka, le gore bontsi bo seka ba leswafadiwa ke one. \v 16 Elang tlhoko gore go se nne moleofi ope wa maleo a tlhakanelo dikobo kana yo a senang bomodimo jaaka Esau, yo a neng a rekisa botsalwapele jwa gagwe ka mogopo wa dijo. \v 17 Gonne le a itse gore morago ga se, erile a eletsa go rua tshegofatso, o ne a ganwa, ka gore o ne a tlhoka sebaka sa boikotlhao, le fa a ne a bo tsoma a lela ka dikeledi.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/12/18.txt b/12/18.txt
index 43ba202..b9458c2 100644
--- a/12/18.txt
+++ b/12/18.txt
@@ -1 +1,5 @@
-\v 18 Gonne le tsile ko thabeng e e ka se kgongweng ka diatla, thaba ya molelo o o tukang, lefifi, khutsafalo e kgolo le setsuatsuwe. \v 19 Ga lea a tla ko porompeteng e e galabetegang, kana ko lentsweng le le buang mafoko a bautlwi ba one ba kopang gore a seka a buiwa le bone gape. \v 20 Gonne ba ne ba sa kgone go itshokela se se neng se laelwa:" Le fa phologolo e ka kgomana le thaba e tshwanetse ya kgobotlediwa ka matlapa." \v 21 Go ne go tshosa mo ponong ya ga Moshe mo a neng a re, "ke a boifa ke a roroma."
\ No newline at end of file
+<<<<<<< HEAD
+\v 18 Gonne le tsile ko thabeng e e ka se kgongweng ka diatla, thaba ya molelo o o tukang, lefifi, khutsafalo e kgolo le setsuatsuwe. \v 19 Ga lea a tla ko porompeteng e e galabetegang, kana ko lentsweng le le buang mafoko a bautlwi ba one ba kopang gore a seka a buiwa le bone gape. \v 20 Gonne ba ne ba sa kgone go itshokela se se neng se laelwa:" Le fa phologolo e ka kgomana le thaba e tshwanetse ya kgobotlediwa ka matlapa." \v 21 Go ne go tshosa mo ponong ya ga Moshe mo a neng a re, "ke a boifa ke a roroma."
+=======
+\v 18 Gonne ga le a tla kwa thabeng e e ka kgongwang, thaba ya molelo o o tukang, lefifi, khutsafalo e kgolo le matsubutsubu. \v 19 Ga le a tla kwa go leleng ga torompeta, kana ko lentsweng le le buang mafoko a bautlwi ba one ba kopang gore a seka a buiwa le bone gape. \v 20 Gonne ba ne ba sa kgone go itshokela se se neng se laelwa:" Fa e le gore le phologolo e ka kgoma thaba, e tshwanetse go kgobotlediwa ka matlapa." \v 21 Pono e e ne e tshosa mo Moshe a neng a re, "Ke a boifa ke a roroma."
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/12/22.txt b/12/22.txt
index b86fb26..4367bd5 100644
--- a/12/22.txt
+++ b/12/22.txt
@@ -1 +1,5 @@
-\v 22 Boemong jwa se, le tsile kwa Thabeng ya Sione le motse wa Modimo yo o tshelang, Jerusalema wa selegodimo, le ko boipelong ba dikete tse some tsa baengele. \v 23 Le tsile phuthegong ya motsalwa pele, e e kwadisetsweng kwa legodimong. Le tsile kwa Modimong, moathodi wa botlhe, le ko meweng ya basiami botlhe ba ba siamisitsweng. \v 24 Le tsile kwa go Jeso, motshereganyi wa kgolagano e ntshwa, le kwa mading a a kgatshiwang a a buang dilo tse di molemo go gaisa madia a ga Abele.
\ No newline at end of file
+<<<<<<< HEAD
+\v 22 Boemong jwa se, le tsile kwa Thabeng ya Sione le motse wa Modimo yo o tshelang, Jerusalema wa selegodimo, le ko boipelong ba dikete tse some tsa baengele. \v 23 Le tsile phuthegong ya motsalwa pele, e e kwadisetsweng kwa legodimong. Le tsile kwa Modimong, moathodi wa botlhe, le ko meweng ya basiami botlhe ba ba siamisitsweng. \v 24 Le tsile kwa go Jeso, motshereganyi wa kgolagano e ntshwa, le kwa mading a a kgatshiwang a a buang dilo tse di molemo go gaisa madia a ga Abele.
+=======
+\v 22 Boemong jwa se, le tsile kwa Thabeng ya Sione le motse wa Modimo yo o tshelang, Jerusalema wa selegodimo, le kwa boipelong ba dikete tse some tsa baengele. \v 23 Le tsile phuthegong ya motsalwa pele, e e kwadisetsweng kwa legodimong. Le tsile kwa Modimong, moathodi wa botlhe, le ko meweng ya basiami botlhe ba ba siamisitsweng. \v 24 Le tsile kwa go Jeso, motshereganyi wa kgolagano e ntsha, le kwa mading a a kgatshiwang a a buang dilo tse di molemo go gaisa madi a ga Abele.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/12/25.txt b/12/25.txt
index 44037dc..e4b6034 100644
--- a/12/25.txt
+++ b/12/25.txt
@@ -1 +1,5 @@
-\v 25 Bonang gore ga le gane ene yo o buang. Gonne fa ba ne ba sa kgona go falola yo oneng a ba tlhagisa ba le mo lefatsheng, re ka kgona jang go falola yo o ba tlhagisang a le kwa legodimong. \v 26 Ka nako nngwe, lentswe la gagwe le ne la tshikhinya lefatshe. Mme jaanong o solofeditse a re, "Gape ke tla tshikhinya lefatshe, mme eseng le fatshe hela, le le magodimo.''
\ No newline at end of file
+<<<<<<< HEAD
+\v 25 Bonang gore ga le gane ene yo o buang. Gonne fa ba ne ba sa kgona go falola yo oneng a ba tlhagisa ba le mo lefatsheng, re ka kgona jang go falola yo o ba tlhagisang a le kwa legodimong. \v 26 Ka nako nngwe, lentswe la gagwe le ne la tshikhinya lefatshe. Mme jaanong o solofeditse a re, "Gape ke tla tshikhinya lefatshe, mme eseng le fatshe hela, le le magodimo.''
+=======
+\v 25 Bonang gore ga le gane ene yo o buang. Gonne fa ba ne ba sa kgona go falola yo o neng a ba tlhagisa ba le mo lefatsheng, re ka kgona jang go falola yo o  tlhagisang a le kwa legodimong. \v 26 Ka nako nngwe, lentswe la gagwe le ne la tshikhinya lefatshe. Mme jaanong o solofeditse a re, "Gape ke tla tshikhinya,  eseng lefatshe fela, mme le magodimo.''
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/12/27.txt b/12/27.txt
index fae81e2..7440689 100644
--- a/12/27.txt
+++ b/12/27.txt
@@ -1 +1,5 @@
-\v 27 Mafoko a, "Gape gape," a raya go tlosiwa ga dilo tshotlhe tse di ka tshikhinyegang, mo go raya, mo dilong tsotlhe tse di tlhodilweng, gore dilo tsotlhe tse di ka seke tsa tshikhinyega tsone di tla sala. \v 28 Ka jalo, amogelang puso e e ka sekang ya tshikhinngwa, a re lebogeng, ka tsela e a re obameleng le go tlotla le go tsholetsa Modimo. \v 29 Gonne Modimo wa rona ke molelo o o nyeletsang.
\ No newline at end of file
+<<<<<<< HEAD
+\v 27 Mafoko a, "Gape gape," a raya go tlosiwa ga dilo tshotlhe tse di ka tshikhinyegang, mo go raya, mo dilong tsotlhe tse di tlhodilweng, gore dilo tsotlhe tse di ka seke tsa tshikhinyega tsone di tla sala. \v 28 Ka jalo, amogelang puso e e ka sekang ya tshikhinngwa, a re lebogeng, ka tsela e a re obameleng le go tlotla le go tsholetsa Modimo. \v 29 Gonne Modimo wa rona ke molelo o o nyeletsang.
+=======
+\v 27 Mafoko a, "Gape gape," a raya go tlosiwa ga dilo tsotlhe tse di ka tshikhinngwang, ke gore, mo dilong tsotlhe tse di tlhodilweng, gore dilo tsotlhe tse di ka seke tsa tshikhinngwa di sale. \v 28 Ka jalo, amogelang puso e e ka sekang ya tshikhinngwa, a re lebogeng, ka tsela e a re obameleng le go tlotla le go tsholetsa Modimo. \v 29 Gonne Modimo wa rona ke molelo o o nyeletsang.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/13/01.txt b/13/01.txt
index 67aa78d..840c54e 100644
--- a/13/01.txt
+++ b/13/01.txt
@@ -1 +1,5 @@
-\c 13 \v 1 A lorato la bakaulengwe le tswelele . Le seka la lebala go amogela batho ba le sa ba itseng . \v 2 Gonne  ka go dira jalo bangwe ba fitlhetse ba amogetse baengele ba sa itse .
\ No newline at end of file
+<<<<<<< HEAD
+\c 13 \v 1 A lorato la bakaulengwe le tswelele . Le seka la lebala go amogela batho ba le sa ba itseng . \v 2 Gonne  ka go dira jalo bangwe ba fitlhetse ba amogetse baengele ba sa itse .
+=======
+\v 1 A lorato la bakaulengwe le tswelele . Le seka la lebala go amogela batho ba le sa ba itseng . \v 2 Gonne  ka go dira jalo bangwe ba fitlhetse ba amogetse baengele ba sa itse .
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/13/03.txt b/13/03.txt
index 51a470d..4a9983b 100644
--- a/13/03.txt
+++ b/13/03.txt
@@ -1 +1,5 @@
-\v 3 Gakologelwang magolegwa, jaaka ekete le tshwerwe le bone. Gakologelwang ba ba sotlwang, jaaka ekete le utlwa botlhoko mo mmeleng le bone. \v 4 A nyalo e tlotlwe ke botlhe. A bolao jwa lenyalo bo itsheke, gonne Modimo o tsile go atlhola ba ba botlhaswa mo thobalong ga mmogo le baakafadi.
\ No newline at end of file
+<<<<<<< HEAD
+\v 3 Gakologelwang magolegwa, jaaka ekete le tshwerwe le bone. Gakologelwang ba ba sotlwang, jaaka ekete le utlwa botlhoko mo mmeleng le bone. \v 4 A nyalo e tlotlwe ke botlhe. A bolao jwa lenyalo bo itsheke, gonne Modimo o tsile go atlhola ba ba botlhaswa mo thobalong ga mmogo le baakafadi.
+=======
+\v 3 Gakologelwang magolegwa, jaaka ekete le tshwerwe le bone. Gakologelwang ba ba sotlwang, jaaka ekete le utlwa botlhoko mo mmeleng le bone. \v 4 A lenyalo le tlotlwe ke botlhe. A bolao jwa lenyalo bo itsheke, gonne Modimo o tsile go atlhola ba ba botlhaswa mo thobalong ga mmogo le baakafadi.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/13/09.txt b/13/09.txt
index 9f92940..dfac0d4 100644
--- a/13/09.txt
+++ b/13/09.txt
@@ -1 +1,5 @@
-\v 9 Le seka la tsietswa ke dithuto tse di sa itsegaleng tse di tswang kwa ntle. Gonne go molemo fa pelo e thatafadiwa ka tshegofatso eseng ka dijo tse di sa thuseng sepe ba ba tshelelang ka tsone. \v 10 Re na le aletara e ope yo o dirang mo tebanekeleng a sa tshwanelweng ke go ja mo go yone. \v 11 Gonne madi a diphologolo tse di bolaetsweng go bipa maleo a isiwa ke moperesiti fa felong fa go boitshepo, fa mebele ya tsone e tshubelwa kwa ntle ga kampa.
\ No newline at end of file
+<<<<<<< HEAD
+\v 9 Le seka la tsietswa ke dithuto tse di sa itsegaleng tse di tswang kwa ntle. Gonne go molemo fa pelo e thatafadiwa ka tshegofatso eseng ka dijo tse di sa thuseng sepe ba ba tshelelang ka tsone. \v 10 Re na le aletara e ope yo o dirang mo tebanekeleng a sa tshwanelweng ke go ja mo go yone. \v 11 Gonne madi a diphologolo tse di bolaetsweng go bipa maleo a isiwa ke moperesiti fa felong fa go boitshepo, fa mebele ya tsone e tshubelwa kwa ntle ga kampa.
+=======
+\v 9 Le seka la tsiediwa ke dithuto tse di sa itsegaleng tse di tswang kwa ntle. Gonne go molemo fa pelo e thatafadiwa ka tshegofatso eseng ka dijo tse di sa thuseng sepe ba ba tshelang ka tsone. \v 10 Re na le aletara e ope yo o dirang mo motlaaganeng a sa tshwanelweng ke go ja mo go yone. \v 11 Gonne madi a diphologolo tse di bolaetsweng go bipa maleo a isiwa ke moperesiti fa felong fa go boitshepo, fa mebele ya tsone e tshubelwa kwa ntle ga bothibelelo.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/13/12.txt b/13/12.txt
index da9af53..e90c8ea 100644
--- a/13/12.txt
+++ b/13/12.txt
@@ -1 +1,5 @@
-\v 12 Ka jalo Jeso le ene one a sotlelwa ka kwa ntle ga kgoro ya motse, gore a tle a siamise batho ka madi a gagwe ka sebele. \v 13 A re yeng kwa go ene kwa ntle ga kampa, re rwele matlhabisaditlhong a gagwe. \v 14 Gonne ga re na motse wa sennelaruri fa. Boemo jwa moo, re lebeletse motse o o tlang.
\ No newline at end of file
+<<<<<<< HEAD
+\v 12 Ka jalo Jeso le ene one a sotlelwa ka kwa ntle ga kgoro ya motse, gore a tle a siamise batho ka madi a gagwe ka sebele. \v 13 A re yeng kwa go ene kwa ntle ga kampa, re rwele matlhabisaditlhong a gagwe. \v 14 Gonne ga re na motse wa sennelaruri fa. Boemo jwa moo, re lebeletse motse o o tlang.
+=======
+\v 12 Ka jalo Jeso le ene one a sotlelwa kwa ntle ga kgoro ya motse, gore a tle a siamise batho ka madi a gagwe ka sebele. \v 13 A re yeng kwa go ene kwa ntle ga bothibelelo, re rwele matlhabisaditlhong a gagwe. \v 14 Gonne ga re na motse wa sennelaruri fa. Boemong jwa moo, re lebeletse motse o o tlang.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/13/15.txt b/13/15.txt
index 97a3d5f..f4abde6 100644
--- a/13/15.txt
+++ b/13/15.txt
@@ -1 +1,5 @@
-\v 15 Ka ene, jalo he, a re ntshetseng Modimo ditlhabelo tsa kgalaletso ka nako tsotlhe, kgalaletso e e leng leungo la dipounama le le godisang leina la gagwe. \v 16 A re seka ra lebala go dira bomolemo le go thusanya, gonne Modimo o itumedisiwa thata ke ditlhabelo tsa mofuta o. \v 17 Utlwang le bo le ikobele baeteledipele ba lona, gonne ba disa mewa ya lona, fela jaaka ba ba tsileng go fa tlhaloso. Nnang kutlo gore baeteledipele ba lona ba tle ba dire se ka boitumelo, eseng ka go ngongorega, selo se se sa kakeng sa le sologela mosola.
\ No newline at end of file
+<<<<<<< HEAD
+\v 15 Ka ene, jalo he, a re ntshetseng Modimo ditlhabelo tsa kgalaletso ka nako tsotlhe, kgalaletso e e leng leungo la dipounama le le godisang leina la gagwe. \v 16 A re seka ra lebala go dira bomolemo le go thusanya, gonne Modimo o itumedisiwa thata ke ditlhabelo tsa mofuta o. \v 17 Utlwang le bo le ikobele baeteledipele ba lona, gonne ba disa mewa ya lona, fela jaaka ba ba tsileng go fa tlhaloso. Nnang kutlo gore baeteledipele ba lona ba tle ba dire se ka boitumelo, eseng ka go ngongorega, selo se se sa kakeng sa le sologela mosola.
+=======
+\v 15 Ka ene, jalo he, a re ntshetseng Modimo ditlhabelo tsa kgalaletso ka nako tsotlhe, kgalaletso e e leng leungo la dipounama le le godisang leina la gagwe. \v 16 A re seka ra lebala go dira bomolemo le go thusanya, gonne Modimo o itumedisiwa thata ke ditlhabelo tsa mofuta o. \v 17 Utlwang le bo le ikobele baeteledipele ba lona, gonne ba disa mewa ya lona, fela jaaka ba ba tsileng go fa tlhaloso. Nnang kutlo gore baeteledipele ba lona ba tle ba dire se ka boitumelo, eseng ka go ngongorega, selo se se sa kakeng sa le sologela molemo.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/13/20.txt b/13/20.txt
index 8285f3e..1bbcd8c 100644
--- a/13/20.txt
+++ b/13/20.txt
@@ -1 +1,5 @@
-\v 20 Jaanong a Modimo wa kagiso, yo o busitseng modisa mogolo wa dinku go tswa kwa go ba ba suleng , Morena wa rona Jeso, ka madi a kgolagano e e sa feleng, \v 21 a le siamise ka sengwe le sengwe se se molemo go dira thato ya gagwe. A a dire mo go rona se se mo itumedisang go le go golo, ka Jeso Keresete, a kgalalelo e isiwe go ene ka bosakhutleng. Amene.
\ No newline at end of file
+<<<<<<< HEAD
+\v 20 Jaanong a Modimo wa kagiso, yo o busitseng modisa mogolo wa dinku go tswa kwa go ba ba suleng , Morena wa rona Jeso, ka madi a kgolagano e e sa feleng, \v 21 a le siamise ka sengwe le sengwe se se molemo go dira thato ya gagwe. A a dire mo go rona se se mo itumedisang go le go golo, ka Jeso Keresete, a kgalalelo e isiwe go ene ka bosakhutleng. Amene.
+=======
+\v 20 Jaanong a Modimo wa kagiso, yo o busitseng modisa mogolo wa dinku go tswa kwa go ba ba suleng , Morena wa rona Jeso, ka madi a kgolagano e e sa feleng, \v 21 a le siamise ka sengwe le sengwe se se molemo go dira thato ya gagwe. A a dire mo go rona se se mo itumedisang go le go golo, ka Jeso Keresete, a kgalalelo e isiwe go ene ka bosakhutleng. Amen.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/13/22.txt b/13/22.txt
index a70bda2..8d8557d 100644
--- a/13/22.txt
+++ b/13/22.txt
@@ -1 +1,5 @@
-\v 22 Jaanong ke a le kgothatsa, bakaulengwe  go tshola lefoko la kgothatso le ke le le kwaletseng ka bokhutshwane. \v 23 Itseng gore mokaulengwe wa rona Timothi, o golotswe, yo ke tla le bonang ka ene fa a ka tla ka bonako.
\ No newline at end of file
+<<<<<<< HEAD
+\v 22 Jaanong ke a le kgothatsa, bakaulengwe  go tshola lefoko la kgothatso le ke le le kwaletseng ka bokhutshwane. \v 23 Itseng gore mokaulengwe wa rona Timothi, o golotswe, yo ke tla le bonang ka ene fa a ka tla ka bonako.
+=======
+\v 22 Jaanong ke a le kgothatsa, bakaulengwe  go tshola lefoko la kgothatso le ke le le kwaletseng ka bokhutshwane. \v 23 Itseng gore mokaulengwe wa rona Timotheo, o golotswe, yo ke tla le bonang le ene fa a ka tla ka bonako.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/13/24.txt b/13/24.txt
index 543176b..25c8bb3 100644
--- a/13/24.txt
+++ b/13/24.txt
@@ -1 +1,5 @@
-\v 24 Dumedisang baeteledipele botlhe ba lona le badumedi botlhe. Ba ba ko Italia ba le dumedisa. \v 25 A tshegofatso e nne le lona lotlhe.
\ No newline at end of file
+<<<<<<< HEAD
+\v 24 Dumedisang baeteledipele botlhe ba lona le badumedi botlhe. Ba ba ko Italia ba le dumedisa. \v 25 A tshegofatso e nne le lona lotlhe.
+=======
+\v 24 Dumedisang baeteledipele botlhe ba lona le badumedi botlhe. Ba ba ko Itali ba a le dumedisa. \v 25 A tshegofatso e nne le lona lotlhe.
+>>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
diff --git a/manifest.json b/manifest.json
index 606bf9f..4ae81ea 100644
--- a/manifest.json
+++ b/manifest.json
@@ -44,144 +44,33 @@
 		"pontsho",
 		"david ntsima",
 		"GOITSEMANG ",
-		"Kagelelo Mokgosi"
+		"Kagelelo Mokgosi",
+		"Gopolang Mmereki\t",
+		"Taolo Thabang Kareng",
+		"Lemphitlhetse Reetsakgosi",
+		"Pontsho",
+		"David Ntsima",
+		"Goitsemang"
 	],
 	"finished_chunks": [
 		"front-title",
 		"01-title",
-		"01-01",
-		"01-04",
-		"01-06",
-		"01-08",
-		"01-10",
-		"01-13",
 		"02-title",
-		"02-01",
-		"02-02",
-		"02-05",
-		"02-07",
-		"02-09",
-		"02-11",
-		"02-13",
-		"02-16",
-		"03-title",
-		"03-01",
-		"03-05",
-		"03-07",
-		"03-09",
-		"03-12",
-		"03-14",
-		"03-16",
 		"04-title",
-		"04-01",
-		"04-03",
-		"04-06",
-		"04-08",
-		"04-12",
-		"04-14",
 		"05-title",
-		"05-01",
-		"05-04",
-		"05-06",
-		"05-07",
-		"05-09",
-		"05-12",
 		"06-title",
-		"06-01",
-		"06-04",
-		"06-07",
 		"06-09",
-		"06-11",
-		"06-13",
-		"06-16",
-		"06-19",
 		"07-title",
-		"07-01",
-		"07-04",
-		"07-07",
-		"07-11",
-		"07-13",
-		"07-15",
-		"07-18",
-		"07-20",
-		"07-22",
-		"07-25",
-		"07-27",
 		"08-title",
-		"08-01",
-		"08-03",
-		"08-06",
-		"08-08",
-		"08-10",
-		"08-11",
 		"08-13",
 		"09-title",
-		"09-01",
-		"09-03",
-		"09-06",
-		"09-08",
-		"09-11",
-		"09-13",
-		"09-16",
 		"09-18",
-		"09-21",
-		"09-23",
-		"09-25",
-		"09-27",
 		"10-title",
-		"10-01",
-		"10-05",
-		"10-08",
-		"10-11",
-		"10-15",
-		"10-17",
-		"10-19",
-		"10-23",
-		"10-26",
-		"10-28",
-		"10-30",
-		"10-32",
-		"10-35",
-		"10-38",
 		"11-title",
-		"11-01",
-		"11-04",
-		"11-05",
-		"11-07",
-		"11-08",
-		"11-11",
-		"11-13",
-		"11-15",
-		"11-17",
-		"11-20",
-		"11-23",
-		"11-27",
-		"11-29",
-		"11-32",
-		"11-35",
-		"11-39",
 		"12-title",
-		"12-01",
-		"12-04",
-		"12-07",
-		"12-09",
-		"12-12",
-		"12-14",
-		"12-18",
-		"12-22",
-		"12-25",
-		"12-27",
 		"13-title",
-		"13-01",
-		"13-03",
 		"13-05",
 		"13-07",
-		"13-09",
-		"13-12",
-		"13-15",
-		"13-18",
-		"13-20",
-		"13-22",
-		"13-24"
+		"13-18"
 	]
 }
\ No newline at end of file