From 73537966cf55d1306253579871b2163d2730ca4a Mon Sep 17 00:00:00 2001
From: michael_rodriguez <michael_rodriguez@wycliffeassociates.org>
Date: Thu, 22 Apr 2021 16:54:08 -0400
Subject: [PATCH] Thu Apr 22 2021 16:54:08 GMT-0400 (Eastern Daylight Time)

---
 18/21.txt     | 6 +-----
 manifest.json | 5 +++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/18/21.txt b/18/21.txt
index 7dd18fef..4eda973a 100644
--- a/18/21.txt
+++ b/18/21.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 21 \v 22
-=======
-\v 21 Tul ch´ul abat te ay yipe la stsak bij ch´en, jich smuk´ul yilel te bit´il te xch´enul te cha-e sok ba jch´oj ta bay muk´ul ja´, jich la yal: "Jich´ ta ora to, Babilonia, te muk´ul lum, yame yich´ ch´ojel koel ta tulan sok mayuk bi ora ya yich´xan ilel. \v 22 Te sk´op te tij arpa-etike, te k´ayojetike, te tij amayetike sok te tij ok´esetike ma xchiknajix ta atojol. Te mach´a ya snaik sjalel bitik nax ma xchikna jix ta atojol. Janix jich ma xchiknajix ta atojol te sk´op te cha-e.
->>>>>>> 61361b80ca1f9465ba5a80ee2d72da2bb6e0e39b
+\v 21 Tul ch´ul abat te ay yipe la stsak bij ch´en, jich smuk´ul yilel te bit´il te xch´enul te cha-e sok ba jch´oj ta bay muk´ul ja´, jich la yal: "Jich´ ta ora to, Babilonia, te muk´ul lum, yame yich´ ch´ojel koel ta tulan sok mayuk bi ora ya yich´xan ilel. \v 22 Te sk´op te tij arpa-etike, te k´ayojetike, te tij amayetike sok te tij ok´esetike ma xchiknajix ta atojol. Te mach´a ya snaik sjalel bitik nax ma xchikna jix ta atojol. Janix jich ma xchiknajix ta atojol te sk´op te cha-e.
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 04b597e0..2f8940f6 100644
--- a/manifest.json
+++ b/manifest.json
@@ -207,6 +207,8 @@
 		"18-14",
 		"18-15",
 		"18-18",
+		"18-21",
+		"18-23",
 		"19-title",
 		"19-01",
 		"19-03",
@@ -251,7 +253,6 @@
 		"22-16",
 		"22-17",
 		"22-18",
-		"22-20",
-		"18-23"
+		"22-20"
 	]
 }
\ No newline at end of file