From 7755a954a0b663ddd8fc8cf4d25e1c402af9cff5 Mon Sep 17 00:00:00 2001
From: michael_rodriguez <michael_rodriguez@wycliffeassociates.org>
Date: Sun, 19 Nov 2023 14:38:30 -0400
Subject: [PATCH] Sun Nov 19 2023 14:38:30 GMT-0400 (Atlantic Standard Time)

---
 08/10.txt     |  6 +-----
 08/22.txt     |  6 +-----
 manifest.json | 50 ++++++++++++++++++++++++++------------------------
 3 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/08/10.txt b/08/10.txt
index d9528668..e1be0f3c 100644
--- a/08/10.txt
+++ b/08/10.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 10 Josué ed pherre phiidʉwia ich diu khĩirjũugwai, mʉ werbʉejem khʉʉn kĩiir khaug nʉm ajim, Josué maigmua chi jooin Israelpien  dʉi, amach werbʉajierram Hai phobor dʉi. \v 11 Thumwe õor werbʉajem khʉʉn Josué dʉi thʉnarr khʉʉn  phobor dakha majierram  anʉm. Magwia  amach phoborog mawia mam amach thʉbajierram anʉm Hai norte bi gar sierr aawai.  Magwia phaaurug bigaau  thʉbajierram anʉm Hai dʉi. \v 12 Ich diu õor  sinko, mil jʉrauwia, makhʉʉn õor tharap ee pharpim kĩirjo ausiujim  ma edau duugjem bigar phobor Betel Hai dʉi.
-=======
-\v 10 Josué ed pherre phiidʉwia ich diu khĩirjũugwai, mʉ werbʉejem khʉʉn kĩiir khaug nʉm ajim, Josué maigmua chi jooin Israelpien dʉi, amach werbʉajierram Hai phobor dʉi. \v 11 Thumwe õor werbʉajem khʉʉn Josué dʉi thʉnarr khʉʉn phobor dakha majierram anʉm. Magwia amach phoborog mawia mam amach thʉbajierram anʉm Hai norte bi gar sierr aawai. Magwia phaaurug bigaau thʉbajierram anʉm Hai dʉi. \v 12 Ich diu õor  sinko, mil jʉrauwia, makhʉʉn õor tharap ee pharpim kĩirjo ausiujim ma edau duugjem bigar phobor Betel Hai dʉi.
->>>>>>> db967377264a886cc8dfd2e87fb0a801ac67d2fe
+\v 10 Josué ed pherre phiidʉwia ich diu khĩirjũugwai, mʉ werbʉejem khʉʉn kĩiir khaug nʉm ajim, Josué maigmua chi jooin Israelpien dʉi, amach werbʉajierram Hai phobor dʉi. \v 11 Thumwe õor werbʉajem khʉʉn Josué dʉi thʉnarr khʉʉn phobor dakha majierram anʉm. Magwia amach phoborog mawia mam amach thʉbajierram anʉm Hai norte bi gar sierr aawai. Magwia phaaurug bigaau thʉbajierram anʉm Hai dʉi. \v 12 Ich diu õor  sinko, mil jʉrauwia, makhʉʉn õor tharap ee pharpim kĩirjo ausiujim ma edau duugjem bigar phobor Betel Hai dʉi.
\ No newline at end of file
diff --git a/08/22.txt b/08/22.txt
index 5368a924..103e4d9e 100644
--- a/08/22.txt
+++ b/08/22.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 22 Ãuram  khʉʉn õor thʉajem khʉʉn Israelpieen den, makhʉʉnta mag phobor ee bardʉgkhatarr khʉʉn,   werbʉan oberjierram. Magbarwai, chi ẽmkhooin Haiim khʉʉn pʉrkha auwia  Israelpien õor thʉajem khʉʉn dʉi, ãur khʉʉn othoom bigar majierram maigmua dewam khʉʉn agju othoom  gar. Israelpienau Haipieen dʉi werbʉajierram; ni ãbja ĩiubajim ni peerdʉbajierram anʉm. \v 23 Mamʉ amach rein monakha wainaajierram  aajem amach diu pʉrwainarr aawai mamʉ Josué khĩir phee aubeejierram.
-=======
-\v 22 Ãuram khʉʉn õor thʉajem khʉʉn Israelpieen den, makhʉʉnta mag phobor ee bardʉgkhatarr khʉʉn, werbʉan oberjierram. Magbarwai, chi ẽmkhooin Haiim khʉʉn pʉrkha auwia Israelpien õor thʉajem khʉʉn dʉi, ãur khʉʉn othoom bigar majierram maigmua dewam khʉʉn agju othoom gar. Israelpienau Haipieen dʉi werbʉajierram; ni ãbja ĩiubajim ni peerdʉbajierram anʉm. \v 23 Mamʉ amach rein monakha wainaajierram aajem amach diu pʉrwainarr aawai mamʉ Josué khĩir phee aubeejierram.
->>>>>>> db967377264a886cc8dfd2e87fb0a801ac67d2fe
+\v 22 Ãuram khʉʉn õor thʉajem khʉʉn Israelpieen den, makhʉʉnta mag phobor ee bardʉgkhatarr khʉʉn, werbʉan oberjierram. Magbarwai, chi ẽmkhooin Haiim khʉʉn pʉrkha auwia Israelpien õor thʉajem khʉʉn dʉi, ãur khʉʉn othoom bigar majierram maigmua dewam khʉʉn agju othoom gar. Israelpienau Haipieen dʉi werbʉajierram; ni ãbja ĩiubajim ni peerdʉbajierram anʉm. \v 23 Mamʉ amach rein monakha wainaajierram aajem amach diu pʉrwainarr aawai mamʉ Josué khĩir phee aubeejierram.
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 93fa333d..ad3f208b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -136,10 +136,12 @@
 		"08-03",
 		"08-05",
 		"08-08",
+		"08-10",
 		"08-13",
 		"08-15",
 		"08-18",
 		"08-20",
+		"08-22",
 		"08-24",
 		"08-27",
 		"08-29",
@@ -187,6 +189,15 @@
 		"11-title",
 		"11-01",
 		"11-04",
+		"11-06",
+		"11-08",
+		"11-10",
+		"11-12",
+		"11-14",
+		"11-16",
+		"11-18",
+		"11-21",
+		"11-23",
 		"12-title",
 		"12-01",
 		"12-03",
@@ -248,9 +259,23 @@
 		"15-60",
 		"15-63",
 		"16-title",
+		"16-01",
+		"16-03",
+		"16-05",
+		"16-08",
+		"16-10",
 		"17-title",
 		"17-01",
+		"17-03",
+		"17-05",
+		"17-07",
+		"17-09",
+		"17-11",
+		"17-13",
+		"17-14",
+		"17-16",
 		"18-title",
+		"18-01",
 		"18-03",
 		"18-05",
 		"18-07",
@@ -268,29 +293,6 @@
 		"21-title",
 		"22-title",
 		"23-title",
-		"24-title",
-		"11-06",
-		"11-08",
-		"11-10",
-		"11-12",
-		"11-14",
-		"11-16",
-		"11-18",
-		"11-21",
-		"11-23",
-		"16-01",
-		"16-03",
-		"16-05",
-		"16-08",
-		"16-10",
-		"17-03",
-		"17-05",
-		"17-07",
-		"17-09",
-		"17-11",
-		"17-13",
-		"17-14",
-		"17-16",
-		"18-01"
+		"24-title"
 	]
 }
\ No newline at end of file