diff --git a/31/39.txt b/31/39.txt
index de6c5a2..00db5e5 100644
--- a/31/39.txt
+++ b/31/39.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 39 Bakabalwe bali 30,500 ukufuma mu cipande cakwa Yaweh bali amakumi mutanda. \v 40 Abantu bali amakana ikumi limo na mutanda bana mayo ukufuma mu cipande ca kwa Yaweh bali amakumi yatatu nababili. \v 41 Mose asendele umusonko ulya uwali no kutulwa kuli Yaweh. wo apelewene kuli Eleaza shimapepo, ngefyo Yaweh akonkomeshe Mose.
-=======
-\v 39 Bapunda bali 30,500 palisho ishakwa Yahweh shali amakumi matanda naimo. \v 40 Abantu bali amakana ikumi na mutanda abanakashi pali abo bali amakumi yatatu na babili. \v 41 Mose apitile umusonko uyo uwalinokuba umutuulo wakwa Yahweh. Aupele kuli Eleasa shimapepo ngefyo Yahweh alekumukonkomesha.
->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0
+\v 39 Bakabalwe bali 30,500 ukufuma mu cipande cakwa Yaweh bali amakumi mutanda. \v 40 Abantu bali amakana ikumi limo na mutanda bana mayo ukufuma mu cipande ca kwa Yaweh bali amakumi yatatu nababili. \v 41 Mose asendele umusonko ulya uwali no kutulwa kuli Yaweh. wo apelewene kuli Eleaza shimapepo, ngefyo Yaweh akonkomeshe Mose.
\ No newline at end of file
diff --git a/31/42.txt b/31/42.txt
index c67f69c..80822b1 100644
--- a/31/42.txt
+++ b/31/42.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 42 Nga ica bantu citika wa bena Isreali ulya Ming'ombese asendele ukufuma ku bashilika abo baile ku nkondo, \v 43 citika wa bantu bonse wali 337,500 impanga, \v 44 amakana amakumi yatatu na mutanda ba cilume ba ng'ombe, \v 45 30,500 bakabalwe, \v 46 na makana ikumi na mutanda bana mayo.
-=======
-\v 42 Ukulosha kuli citika wabena abo Mose aitile ukuya ukufuma mubashilika abailekuya \v 43 kubulwi---mumishi citika alingile ukuba 337,500 iya mpanga, \v 44 amakana amakumi yatatu na mutanda aya ngombe, \v 45 30,500 iya bapunda, \v 46 Elo ikana ikumi mutanda ilya banakashi.
->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0
+\v 42 Nga ica bantu citika wa bena Isreali ulya Ming'ombese asendele ukufuma ku bashilika abo baile ku nkondo, \v 43 citika wa bantu bonse wali 337,500 impanga, \v 44 amakana amakumi yatatu na mutanda ba cilume ba ng'ombe, \v 45 30,500 bakabalwe, \v 46 na makana ikumi na mutanda bana mayo.
\ No newline at end of file
diff --git a/31/47.txt b/31/47.txt
index 3a5f042..056b801 100644
--- a/31/47.txt
+++ b/31/47.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 47 ukufuma ku bantu citika wa bena Isreali, Mose abulipo cimo ukufuma pali cila makumi yasano, pali fyonse abantu ne nama. Wo apele fyo ku bena Levi bo ababikilepofye ukusunga Ihema lya kwa Yaweh, ngefyo Yaweh akonkomeshe wo ukucita.
-=======
-\v 47 Ukufuma pali citika wabena Israeli, Mose abulilepo cimo pali cila makumi yasano, pamo nabantu elo nenama. Apele abena Levi abalikusunga bwino itenti lyakwa Yahweh, ngefyo Yahweh umukonkomeshe ukucita.
->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0
+\v 47 ukufuma ku bantu citika wa bena Isreali, Mose abulipo cimo ukufuma pali cila makumi yasano, pali fyonse abantu ne nama. Wo apele fyo ku bena Levi bo ababikilepofye ukusunga Ihema lya kwa Yaweh, ngefyo Yaweh akonkomeshe wo ukucita.
\ No newline at end of file
diff --git a/31/48.txt b/31/48.txt
index d5fcfaf..fca0ce2 100644
--- a/31/48.txt
+++ b/31/48.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 48 Elyo aba kabamba ba bashilika, ba solwesolwe ba pa makana na kalonda ba pa myanda, baishile kuli mose. \v 49 Bo balandile kuli wo, ''Ababomfi bobe naba penda aba shilika abo ababa panshi ya fyesu ifipope, elo nangu umo talubilepo.
-=======
-\v 48 Eluntu abakalamba bafita, nabakangalila bafita abamakana elo bakapitao pamyanda baishile kuli Mose . \v 49 Balandile kuliye ati, ''Ababomfi bobe balipendele abashilika abo ababa mubutungulushi bwesu, elo tapalia nangu umo umwaume uutalipo.
->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0
+\v 48 Elyo aba kabamba ba bashilika, ba solwesolwe ba pa makana na kalonda ba pa myanda, baishile kuli mose. \v 49 Bo balandile kuli wo, ''Ababomfi bobe naba penda aba shilika abo ababa panshi ya fyesu ifipope, elo nangu umo talubilepo.
\ No newline at end of file
diff --git a/31/50.txt b/31/50.txt
index f5cef62..319aaf6 100644
--- a/31/50.txt
+++ b/31/50.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 50 FWe twaliletela Yaweh umutulo, ico cila mwaume asangile, ifipe fya golide, amakosa, insambo, imbalaminwe, amashikiyo no twa kufwala mumukoshi, ku kupanga icilubula ca fwe kuli Yaweh.'' \v 51 Mose na Eleaza shimamepo bapokelele ukufuma kuli bo golide na fyonse ifipe fya kubaswa.
-=======
-\v 50 Fwebo tuliletele umutuulo wakwa Yahweh, cilamuntu ico asangile, ifipe fya golide, imbalaminwe elo ifikosa, utwakukofya, utwakumatwi, elo notuminyololo twa mumukoshi, kukuyakuifutulako fwebene pabubifi bwesu kuli Yahweh.'' \v 51 Mose elo na Eleasa shimapepo bapokele ukufuma kulibena golide elo naconse icakubaswa.
->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0
+\v 50 FWe twaliletela Yaweh umutulo, ico cila mwaume asangile, ifipe fya golide, amakosa, insambo, imbalaminwe, amashikiyo no twa kufwala mumukoshi, ku kupanga icilubula ca fwe kuli Yaweh.'' \v 51 Mose na Eleaza shimamepo bapokelele ukufuma kuli bo golide na fyonse ifipe fya kubaswa.
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 0101af5..1e6e919 100644
--- a/manifest.json
+++ b/manifest.json
@@ -371,6 +371,10 @@
 		"30-13",
 		"30-15",
 		"31-title",
+		"31-42",
+		"31-47",
+		"31-48",
+		"31-50",
 		"31-52",
 		"32-title",
 		"32-01",