Thu Jul 27 2023 09:57:10 GMT+0200 (Central Africa Time)

13/01.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\c 13 \v 1 Elyo muchikombelo mu Antioch, kwakali ba hinhimi aba mayi. Bakali ba Barnabas, Simeon (Uitwa kuti Niger), Lucius waku Cyrene, Manaen (Wakakomena antoomwe a Herod mwami), a Saulo. \v 2 No bakacili kukomba Mwami akuliimya Moza Usalala  wakaamba, "Amumbikile ambali Barnabas a Saulo, kuti babeleke mulimo ngwinda kabaitila. \v 3 Noba kamana ku liinya, akupaila, bakatandabika matanhyi abo, abalombwana aba, akubatuma kuti baunke.
-=======
-\c 13 \v 1 Elyo mucikombelo mu Antioch, kwakali ba hinhimi aba mayi. Bakali ba Barnabas, Simion (uitwa kuti Niger), Lucius waku Cyrene, Manaen (wakakomena antoomwe a Herold mwami) a Saulu. \v 2 Nobakacili kukomba Mwami akuliimya. Moza usalala wakaamba, Amumbikile ambali Banabas a Saulu, kuti babeleke mulimo ngwinda kabaitila. \v 3 Nobakama ku liimya a kupaila, bakatandabika matanhi abo, abalombwana aba, akubatuma kuti baunke.
->>>>>>> de5d12a5ab642c03cf703869609ad57f8522e2c9
+\c 13 \v 1 \v 2 \v 3

13/04.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 4 Barnabas a Saulo, mukutumwa a Moza Usalala, bakaunka ku Seleucia; kuhwa waawo baka kwasula kuya ku Cyprus. \v 5 No bakaka cili mudolopo lya Salamis, bakakambauka izwi lya Leza muma synagogue abama Juda. Bakali kwete a Johani mbuli mugwahyi.
-=======
-\v 4 Barnabas Saul, mukutumwa a Moza usalala, bakaunka ku Seleucia; kuhwa waawo bakakwassula kuyaku Cyprus. \v 5 Nobakali mudolopo lya Salamis,  bakakambauka Izwi la Leza mu ma Synagogo abama Juda. Bakalikwete a Johwani mbuli mugwahyi.
->>>>>>> de5d12a5ab642c03cf703869609ad57f8522e2c9
+\v 4 \v 5

13/06.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 6 Noba kaunka munsumbu yoonse kuya ku Paphos, bakayana mulombwana umwi wakali hikusonda mu Juda mu hinhimi wakubeya, wakali a hyina lya ba-jeso. \v 7 Oyu musondi, wakali kale kumweendehyi wacihyi, Sergius Paulus, wakali mulombwana musongo. Oyu mulombwana wakaita Barnabas a Saulo, nkaambo wakayandihihya kunvwa izwi lya Leza. \v 8 Pele Elymas "hi kusonda " (obo mbolisandululwa hyina lyakwe) wakabakazhya, wakasola kukahya mweendelehyi kuhwa ku luhyomo.
-=======
-\v 6 Nobakaunka mu nsumbu yoonse kuya ku Paphos, bakayana mulombwana umwi wakali hikusonda, mu Juda muhinhimi wakubeya, wakali a hyina lya Ba-Jesus. \v 7 Oyu musondi, wakali kele ku mweedehyi, wacihyi, Sergius Paulus, wakali mulombwana musongo. Oyu mulombwana wakaita Barnabas a Saulu, nkaambo wakayandihihya kunvwa Izwi lya Leza. \v 8 Pele Elymas"hikusonda"(abo mbolasandululwa hyina lyakwe) wakabakahya; wakasola kukahya mweendelehyi kuhwa ku luhyomo.
->>>>>>> de5d12a5ab642c03cf703869609ad57f8522e2c9
+\v 6 \v 7 \v 8 Conflict Parsing Error

13/09.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 9 Pele Saulo, kumwi kaitwa kuti Paulo, kazwile Moza Usalala, waka mulangihya ca kumutwiimana. \v 10 Wakaamba, "Webo omwana wa dyabooli, ozwile bucengi abubyaabi. Ohinkondonyina a bululami. Kunyina totileke kupilinganya inhyila zhya Leza hyisoolokele, hena ulaleka?
-=======
-\v 9 Pele Saulu, kumwi kaitwa kuti Paulu, Kazwile Moza usalala, wakamulangihihya ca kumutwiimana \v 10 wakaamba, "Webo omwana wa Satani, ozwile bucengi abubyaabi. Ohinkondonyina a bululami. kunyina totileke kupilinganya inhyila zhya Leza hyisoolokele, hena ulaleka?
->>>>>>> de5d12a5ab642c03cf703869609ad57f8522e2c9
+\v 9 \v 10 Conflict Parsing Error

13/11.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 11 Ono langa, itanhyi lya Leza lili ali ndiwe, ulaba moohu. Toli libone zuba kwa ciindi cihyoonto. "Kuhwambaana kwakaba hikunku a uhinze ali Elymas, wakatalika kuhyinguluka kuyandaula bantu kuti bamu kwatilile kutanhyi. \v 12 Mweendelehyi nakabona cakacitika wakahyoma nkaambo waka kankamana ku luyiihyo lwa Mwami.
-=======
-\v 11 Ono langa, itanhyi lya Leza lili alindiwe, ulaba moohu. Totilibone Zuba kwa ciindi cihyoonto. "Kuhwambaana kwakaba hikunku a muhinze ali Elymas. Wakatalika kuhyinguluka kuyandaula bantu kuti bamukwatilile kutanhyi. \v 12 Mweendelehyi nakabona cakacitika, wakahyoma nkaambo wakakankamana ku luyiihyo lwa Mwami.
->>>>>>> de5d12a5ab642c03cf703869609ad57f8522e2c9
+\v 11 \v 12 Conflict Parsing Error

13/13.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 13 Ono Paulo a beenhyinyina bakatalika kukwasula kuhwa ku Paphos bakahika ku Perga mu Pamphylia. Pele Johani waka bahiya akupiluka ku Jelusalema. \v 14 Paulo abenhyinyina bakeenda kuhwa ku Perga akuhika ku Antioch mu Pisisdia. Oko bakanjila mu syngogue mubuzuba bwa nsabata akukala. \v 15 No kwakamana kubalwa mulawo abuhinhimi, beendelehyi ba synagogue baka batumina makani, kwaamba kuti, "Nobana bakwesu, na mulikwete makani ambi akuyumyayumya kubantu kuno a mwaambe."
-=======
-\v 13 Ono Paulo a beenhyinyina bakatalika kukwasula kuhwa ku Paphos bakahika ku Perga mu Pampylia.  Johani wakabahiya a kupiluka ku Jerusalema. Paulu a kuhika ku Antioch wa ku Pisidia. Oko bakanjila musynagogo mubuzuba bwa nsabata akukala. \v 14 Nokwakamana kubalwa mulawo abahinhimi, beendelehyi ba Synagogo mubuzuba bwa nsabata akukala. Nokwakamana kubalwa mulawo abahinhyimi, beendelehyi ba synagogo bakatumina makani, kwaamba kuti, "Nobamana bakwesu, na mulikwete makani ambi a kuyumyayumya kubantu kuno, \v 15 amwaambe."
->>>>>>> de5d12a5ab642c03cf703869609ad57f8522e2c9
+\v 13 \v 14 \v 15 Conflict Parsing Error

13/16.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 16 Ono Paulo wakaimikila akutondeka tanhyi; wakaamba kuti, "Nobantu ba Israel alimwi no muyoowa Leza, amuswiilile. \v 17 Leza wabona Israel wakasala bama tata besu akubasumpula nobakali kukala mu nyika lya Egypt, kwiinda mutanhyi lisumpukile waka basololela kuhwa mumo. \v 18 Kwa myaka ili makumi one waba ambabo munkanda.
-=======
-\v 16 Ono Paulu wakaimikila akutandabika tanhyi, wakaamba kuti, "Nobantu aba Israeli alimwi nomumuyoowa Leza, amuswiilile. \v 17 Leza wabana Israeli wakasala bamatata besu a kubasumpula nobakali kukala mu nyika ya Egypt, kwiinda mutanhyi lisumpukile wakabasololela kuhwa mumo. \v 18 Kwamyaka makumi one waba ambabo munkanda.
->>>>>>> de5d12a5ab642c03cf703869609ad57f8522e2c9
+\v 16 \v 17 \v 18 Conflict Parsing Error

13/19.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 19 Nakamana kunyonyoona hihyi zhyi musanu atubili munyika ya Canaan, wakabapa bantu besu nyika yabo kuti cibe cikono. \v 20 Ehyi zhyoonse hyintu nozha kacitika kuli ndile myaka 450. No kwamana hyintu ehyi zhyoonse, Leza wabapa babetehi kuhika a Samuel muhihyimi.
-=======
-\v 19 Nakamana kunyonyoona mahi ali musanu a obile munyika ya Canaan, wakabapa bantu besu nyika yabo kuti cibe cikono. \v 20 Ehyi zhyoonse zhyintu nozhyakacitika kuli indile mmyaka myaanda yone amakumi osanwe (450). No kwakamana hyintu ehyi zhyoonse, Leza wakabapa babetehi kuhika  a Samuel muhinhimi,
->>>>>>> de5d12a5ab642c03cf703869609ad57f8522e2c9
+\v 19 \v 20 Conflict Parsing Error

13/21.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 21 Mpoona bantu bakalomba kuti bapewe Mwami, mpoona Leza waka bapa Saulo mwana wa Kish, mulombwana uhwa ku luzubo lwa Benjamin, kuti abe Mwami kwa myaka ili makumi one. \v 22 Leza naakamana kumuguhya a bwami, wakasumpula David kuti abe mwami wabo. Muli David Leza wakaamba, kuti, 'ndayana kuzwa mumoyo wangu, ucita zhyoonse zhyayanda kuti acite.'
-=======
-\v 21 Mpoona bantu bakalomba kuti bapewe mwami. Mpoona Leza wakabapa Samuel mwana wa Kish, mulombwana uhwa ku luzubo lwa Benjamin kuti abe Mwami kwa myaka ili makumi one. \v 22 Leza naakamana kumuguhya a bwami, wakasumpula David kuti abe mwami wabo. Muli David Leza wakaamba kuti, 'Ndayana Davida mwana wa Jesse kuti abe mulombwana kuzwa mumoyo wangu, ucita zhyoonse nzhyayanda kuti acite.'
->>>>>>> de5d12a5ab642c03cf703869609ad57f8522e2c9
+\v 21 \v 22 Conflict Parsing Error

13/23.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 23 Kuhwa kuhyubo lwa mulombwana oyu, Leza wakaleta ku Israel Muhutuli, Jeso, mbuli mbwaakahyomenhya kucita. \v 24 Katana hika Jeso, Johani wakaambilizhya a lubbizhyo lwakusanduka kuli boonse bana Israel. \v 25 Mbuli Johani mbwaakali kumaninzhya mulimo wakwe, wakamba kuti, "Muyeeya kuti ndime ni? Nhyeli ndime yooyo. Peele a muteelele omwe uboola kunze lyangu, impato zhya kumaulu akwe nhyeyelele kuhyaangulula.
-=======
-\v 23 Kuhwa kubantu ba luhyubo lwa mulombwana oyu, Leza wakaleta ku Israel muhutuli, Jeso, mbuli mbwakahyomehya kucita. \v 24 Katanahika Jeso , Johani wakaambilihya lubizyo lwakusanduka kuli boonse bana Israel. \v 25 Mbuli Johani mbwaakali kumaninzhya mulimo wakwe, wakamba kuti, 'muyeeya kuti ndime ni? Nhyeli ndime yooyo. Pele amuteelele, Omwe uboola kunze lyangu, impato zhya kumaulu akwa nhyelele kuhyaangulula!
->>>>>>> de5d12a5ab642c03cf703869609ad57f8522e2c9
+\v 23 \v 24 \v 25 Conflict Parsing Error

13/26.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 26 Nobana bakwesu, nobana balumyungu lwa Abraham, alimwi akati kenu abaabo bayoowa Leza, nkokuti ndiswe oyu mulumbe waluhutuko nkowatuminwa. \v 27 Nkaambo abo bakala mu Jelusalema aba leli babo tiibaka muhyiba bakazuzukihya mazwi a bahinhimi abalwa  mu nsabata lyoonse akumusulaika.
-=======
-\v 26 Nobana bakwesu, nobana balunyungu lwa Abraham , Alimwi akati kenu abaabo bayoowa Leza, nkokuti ndiswe oyu mulumbe waluhutuko nkowatuminwa.  \v 27 Nkaambo abo bakala mu Jerusama abaleli babo tiibakamuhuiba bakazuzuka mazwi a bahinhimi abalwa mu nsabata zhyoonse akumusulaika.
->>>>>>> de5d12a5ab642c03cf703869609ad57f8522e2c9
+\v 26 \v 27 Conflict Parsing Error

13/28.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 28 Nokuba kuti kunyina cibyaabi nco bakayana cimutola kukuyaiwa, bakaita Pilato kuti a muyaye. \v 29 No bakamana kuzuzukihya zhyoonse zhyakalembelwe kwaamba nguwe, baka museluhya kuhwa mucisamu akumulahyika mucuumbwe.
-=======
-\v 28 Nokuba kuti kuyina cibyaabi ncobakayana cimutola kukuyaiwa, bakaita Pilato kuti amuyaye. \v 29 Nobakamana kuzuzukizhya zhyoonse zhyakalembelwe kwaamba nguwe, bakamuseluhya kuhvwa mucisamu akumulazhyika mucuumbwe.
->>>>>>> de5d12a5ab642c03cf703869609ad57f8522e2c9
+\v 28 \v 29 Conflict Parsing Error

13/30.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 30 Pele Leza wakamubuhya kuhwa kubahu. \v 31 Wakalibonya kwa mazuba manji kuli baabo mbobakaboola limwi kuhwa ku Galilaya kuya ku Jelusalema. Aba bantu ono mbabakamboni bakwe ku bantu.
-=======
-\v 30 Pele Leza wakamuhya kuhvwa kubahu. \v 31 Wakalibonya kwamazuba manji kuli baabo mbobakaboola limwi kuhvwa ku Galilaya kuya ku Jerusalem. Aba bantu ono mbabakamboni bakwe kubantu.
->>>>>>> de5d12a5ab642c03cf703869609ad57f8522e2c9
+\v 30 \v 31 Conflict Parsing Error

13/32.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 32 Ono tumwaambila makani mabotu: Cihyomyo cakahwa kuli bamatata. \v 33 Leza wakazuzukihya kuli ndiswe, ku bana babo, kwiinda mukubuhya Jeso. Mbuli mbokulembelwe Muntembauzho yabili: 'Uli Mwana angu, sunu ndaba bausho." \v 34 Mbuli bwaka mubuhya kuhywa kubahu, kunyina kupiluka alimwi kukubola, wakamba munhila eyi.
-=======
-\v 32 Ono tumwaambila makani mabotu. cihyomyo cakahwa kuli bamatata. \v 33 Leza wakazuzukihya kuli ndiswe, akubana babo, kwiinda mukubuhya Jeso. Mbuli mbokulembelwe muntembauzhyo zhyabili. \v 34 Mbuli kumubuhya kwakwe kuhwa kubahu, kunyina kupiluka alimwi ku kubola! Wakaamba munhyila eyi.
->>>>>>> de5d12a5ab642c03cf703869609ad57f8522e2c9
+\v 32 \v 33 \v 34 Conflict Parsing Error

13/35.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 35 Nkakaako ncaamba alimwi Mutembauzhyo imbi, 'Tokahumizhyi basetekene bako kubona kubola.' \v 36 Mbuli David mbwaaka bamba muzeezo wa Leza mumusela wakwe, wakoona; waka lahyiwa abamauhi mubili wakwe wakabola. \v 37 Pele oyo Leza ngwaakabuhya kunyina nakabola.
-=======
-\v 35 Nkakaako ncaamba alimwi muntembauzhyo imbi, \v 36 mbuli Davida mbwaakabamba muzeezo wa Leza mumusela wakwe, wakoona; wakahyikila abamauhi mubili wakwe wabola. \v 37 Pele oyo Leza ngwaakabuzhya kunyina nakabola.
->>>>>>> de5d12a5ab642c03cf703869609ad57f8522e2c9
+\v 35 \v 36 \v 37 Conflict Parsing Error

13/38.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 38 Ono acihyibwe kuli ndiwe, nobakwesu, kuti kwiinda mumuntu oyu lulekelelo lwa zhyinyonyoono lwakambaulwa kuli ndinwe. Mulawo wa Muusa tiwaali kukonzhya kumusalazhya. \v 39 Pele kwiinda mu muntu oyu Leza ulasalazhya boonse ba hyoma.
-=======
-\v 38 Ono acihyibwe kuli ndinwe, nobakwesu, kuti kwiinda mumuntu oyu lulukelelo lwa Zhyinyonyoono lwakambaulwa kuli ndinwe. Mulawo wa Muusa tiwaali kukonhya kumusalazhya. \v 39 Pele Kwiinda mu muntu oyu Leza ula salazhya boonse ba hyoma.
->>>>>>> de5d12a5ab642c03cf703869609ad57f8522e2c9
+\v 38 \v 39 Conflict Parsing Error

13/40.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 40 Ono amucenjele kuti hyintu zhyakaamba ba hinhimi hyihyita citiki kuli ndinwe: \v 41 Amulange, mwebo nomwingana, muyowe mumanine ku mulobe; Nkaambo ndicita milimo mumazuba eenu, milimo eyo njomutahyome, olo umwi wambilizhya kuli ndimwe.""
-=======
-\v 40 Ono amucenjele kuti hyintu zhyakaamba ba hinhimi hyitacitiki kuli ndinwe: \v 41 'Kamulanga, mwenobahikunyahya, aku kankamana  mwamana munyonyooke; Nkaambo mbeleka mulimo mumazuba eenu, mulimo nkomutakakanzi kuhyoma, nokuba kuti umwi wawaambilizya kuli ndimwe.'"
->>>>>>> de5d12a5ab642c03cf703869609ad57f8522e2c9
+\v 40 \v 41 Conflict Parsing Error

13/42.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 42 Elyo Paulo a Barnabas nobakeenda, bantu baka balomba kuti inga bambaula alimwi mazwi aya insabata icilila. \v 43 Muswaangano wamu synagogue no wakamana, bama Juuda banji bashyoma ba proselytes baka cilila ba Paulo a Barnabas, bakali kwaambaula kuli mbabo akubakombelezhya kuti bazumanane kwiinda muluzhyalo lwa Leza.
-=======
-\v 42 Elyo Paulo a Barnabas nobakeenda, bantu bakabalomba kuti inga bambaula alimwi Mazwi aya insabata icilila. \v 43 Muswaangano wa mu Synagogo nowakamana, bama Juda banji abashyomi ba proselyes bakabacilila ba Paulu a Barnabas, bakali kwaambaula kuli mbabo akubakombelezya kuti bazumanana kwiida muluhyalo lwa Leza.
->>>>>>> de5d12a5ab642c03cf703869609ad57f8522e2c9
+\v 42 \v 43 Conflict Parsing Error

13/44.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 44 Insabata yakacilila, idolopo lyoonse lyakati maniine kubungana kuti banvwe ijwi lya Mwami. \v 45 Bama Juuda nobakabona imbunga, bakazula munyono akutalika kwaambaula hyibyaabi kuli Paulo akumutukana.
-=======
-\v 44 Insabata yakacilila, idolopo lyoonse lyakati maniine kubungana kuti banvwe Izwi lya Mwami. \v 45 Ba ma Juda nobabona imbunga, bakazula munyono  akutalika kwaabaula hyibyaabi kuli Paulu akumutukana.
->>>>>>> de5d12a5ab642c03cf703869609ad57f8522e2c9
+\v 44 \v 45 Conflict Parsing Error

13/46.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 46 Pele Paulo a Barnabas bakaambaula cakuhinizhya akwaamba kuti, "Cilelele kuti ijwi lya Leza lyambaulwe kuli ndinwe kuyaanguna. Kubona kuti mwalitanda kuzhwa kulindinwe akulibona kuti tamwelele a buumi butamani, amubone, tulapilukila kuli bama Gentiles. \v 47 Nkaambo obo Mwami mbwatulailila, kwaamba kuti,, 'Ndamutondeka kuti mube mumuni kuli bama Gentiles, kuti mulete luhutuko kunyika yoonse..""
-=======
-\v 46 Pele Paulu a Barnabas bakaambaula cakuhininzhya a kwaamba kuti, "Cilelele kuti Izwi lya Leza lyambaulwe kuli ndinwe kutaanguna. Kubona kuti mwalitanda kuzhwa kulindinwe akulibona kuti tamwelele a buumi butamani, amubone, tulapilukila kuli bamahi. \v 47 Nkaambo obo Mwami mbwatulaila,kwaamba kuti, 'Ndamubika kuti mube mumuni kuli bamahi, kutewa mulete luhutuko kumahimpilo aanyika.""
->>>>>>> de5d12a5ab642c03cf703869609ad57f8522e2c9
+\v 46 \v 47 Conflict Parsing Error

13/48.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 48 Bama Gentiles nobakanhwa obu, baka botelwa akutembaula izwi lya Mwami. Mbuli banji mboba katondekwa mukuhyoma kubuumi butamani. \v 49 Izwi lya Mwami lyakaunka mu busena boonse.
-=======
-\v 48 Bamahi nobakanhvwa obu, bakabotelwa akutembaula Izwi lya Mwami. Mbuli banji mbobakatondekwa mukuhyoma kubuumi butamani. \v 49 Izwi lya Mwami lyakaunka mu busena boonse.
->>>>>>> de5d12a5ab642c03cf703869609ad57f8522e2c9
+\v 48 \v 49 Conflict Parsing Error

13/50.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 50 Pele bama Juuda baka bayunga ba makintu bakali kuhyomwa aba malombwana bakali basololi ba dolopo. Bakatalika kupangana impenzhyo kuli Paulo a Barnabas akuba waalila kunze abusena. \v 51 Pele Paulo a Barbanas baka kunkumuna kahuko kuhwa kumaulu abo .Mpoona bakaunka ku dolopo pati lya Iconium. \v 52 Elyo bahiciiya bazula kukomana a Moza Usalala.
-=======
-\v 50 Pele bama Juda bakayunga bamakaintu bakali kuhyomwa abamalombwana bakali basololi ba dolopo. Bakatalika kupangana impenzhyo kuli Paulu a Barnabas a kuba waalila kunze a busena. \v 51 Pele Paulu a Barnabas bakakunkumuna kahuko kuhwa kumaulu abo kuli mbabo. Bakaunka ku dolopo lya Iconium. \v 52 Elyo bahiciiya buzula kukomana a Moza usalala.
->>>>>>> de5d12a5ab642c03cf703869609ad57f8522e2c9
+\v 50 \v 51 \v 52 Conflict Parsing Error

13/title.txt

@@ -1,5 +0,0 @@
-<<<<<<< HEAD
-Inchito Cikaando 13
-=======
-Micito
->>>>>>> de5d12a5ab642c03cf703869609ad57f8522e2c9

18/title.txt

@@ -1,5 +1 @@
-<<<<<<< HEAD
-Nciti Cikando 18
-=======
-Caandano 18
->>>>>>> de5d12a5ab642c03cf703869609ad57f8522e2c9
+Conflict Parsing Error