diff --git a/31/18.txt b/31/18.txt
index 997d1fe..4201898 100644
--- a/31/18.txt
+++ b/31/18.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 18 Lelo bulenipo mwebene bonse aba abaice abanakshi bo abashaishiba umwaume mukulala na wo. \v 19 Bonsefye mwebo mwe baipayapo umuntu nangu ukwikata kuli umo baipeye mufwile ukwikala kunse ya nkambi panshiku cine lubali. Pabwalenga shitatu ubushiku no bwalenga cine lubali ubushiku mwe mukasanguluka mwebene na bo mwaleta bunkole. \v 20 Mwe mukasangula fyonse ifya kufwala na fyonse ifya pangwa ku mpapa sha nama na ku masako ya mbushi elo nafonse ifya pangwa ku butonge.''
-=======
-\v 18 Nomba muyekuibulilapo utukashana utwaice utushaishiba abaume nangu ukulungana nabo. \v 19 Mwebo bonse mwebailekwipaya uuli onse nangu ukuya kwikatako kuuli uyo baipeye mufwile ukuyakwikala kunse yankambi panshiku cine lubali. Pabushiku bwakulenga butatu elo nobwakulenga cine lubali mwebo mukaisangulule pamopene nabafungwa benu. \v 20 Webo ukusangulule amalaya yonse elo naconsefye icayakupangwa kumpapa yanama elo nakumasako yambushi naconse icapangwa ukufuma kucimiti.
->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0
+\v 18 Lelo bulenipo mwebene bonse aba abaice abanakshi bo abashaishiba umwaume mukulala na wo. \v 19 Bonsefye mwebo mwe baipayapo umuntu nangu ukwikata kuli umo baipeye mufwile ukwikala kunse ya nkambi panshiku cine lubali. Pabwalenga shitatu ubushiku no bwalenga cine lubali ubushiku mwe mukasanguluka mwebene na bo mwaleta bunkole. \v 20 Mwe mukasangula fyonse ifya kufwala na fyonse ifya pangwa ku mpapa sha nama na ku masako ya mbushi elo nafonse ifya pangwa ku butonge.''
\ No newline at end of file
diff --git a/31/21.txt b/31/21.txt
index 1ce7979..4fefdd0 100644
--- a/31/21.txt
+++ b/31/21.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 21 eleaza shimapepo alandile ku ba shilika abo baile ku nkondo, ''Ici ecilefwaikwa ifunde ilyo Yaweh apele kuli Mose. \v 22 Golide, Silfa, bronzi, icela, icikopo, na Liidi, \v 23 na fyonse ifyo ifishipya mu mulilo,  mwe muli nokufipisha mu mulilo, na fyonse fikaba ifyabusaka. Mwe mwfwile kabilibi musangulule ifyo fintu na menshi ya kuangulula. Naconse icishakapite mu ulilo muli no ku sangulula kuli yalya menshi. \v 24 Mwe mufwile ukuwasha ifya kufwala pa bushiku bwa cine lubali, elo nomba mwe mukba aba sanguluka. Panuma ya ifi mwe kuti mwaisa mu nkambi ya Isreali.''
-=======
-\v 21 Eleasa shimappo ebele fifta ifyaile kunkondo ati, ''Ili efumnde lyapampamikwa elyo Yahewh apele kuli Mose: \v 22 Golide, silfere, bronze, iron, tin elo na lead, \v 23 elo na conse icitasuminisha mumulilo, webo ukacipishemo mumulilo, elo cikasanguka icabune. Webo eluntu ukafisangulule ifyo fyonse ukufipisha mu menshi. Naconse icitakapite mumulilo webo ukafipishe muli ayo yene amenshi. \v 24 Webo ulingile wayakuwasha ififyalo, pabushiku bwakulenga cine lubali elo eluntu webo ulinokuba uwabune. Panuma yaifyo webo kutiwabwelela munkambi yabena Israeli.
->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0
+\v 21 eleaza shimapepo alandile ku ba shilika abo baile ku nkondo, ''Ici ecilefwaikwa ifunde ilyo Yaweh apele kuli Mose. \v 22 Golide, Silfa, bronzi, icela, icikopo, na Liidi, \v 23 na fyonse ifyo ifishipya mu mulilo,  mwe muli nokufipisha mu mulilo, na fyonse fikaba ifyabusaka. Mwe mwfwile kabilibi musangulule ifyo fintu na menshi ya kuangulula. Naconse icishakapite mu ulilo muli no ku sangulula kuli yalya menshi. \v 24 Mwe mufwile ukuwasha ifya kufwala pa bushiku bwa cine lubali, elo nomba mwe mukba aba sanguluka. Panuma ya ifi mwe kuti mwaisa mu nkambi ya Isreali.''
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index fd422e7..0a629e8 100644
--- a/manifest.json
+++ b/manifest.json
@@ -378,6 +378,8 @@
 		"31-11",
 		"31-13",
 		"31-16",
+		"31-18",
+		"31-21",
 		"31-25",
 		"31-28",
 		"31-30",