From 0ba555c8e1f2bec9f3cf5ee22a25ae91560abff8 Mon Sep 17 00:00:00 2001
From: michael_rodriguez <michael_rodriguez@wycliffeassociates.org>
Date: Thu, 22 Apr 2021 11:06:11 -0400
Subject: [PATCH] Thu Apr 22 2021 11:06:10 GMT-0400 (Eastern Daylight Time)

---
 17/20.txt     | 6 +-----
 17/25.txt     | 2 +-
 manifest.json | 7 +++++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/17/20.txt b/17/20.txt
index 0dbefd0e..d9e91428 100644
--- a/17/20.txt
+++ b/17/20.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 20 \v 21
-=======
-\v 20 \v 21 Ma´ jauk nax ya jt´oponbey kajwaltik in to, ja´ nix jichuuk te mach´atik la xch´unik te  jk´ope. Jich yu´un ta spisilik yumx mej yax xk´otik, jich te bit´il, jo´on ayon ta atojol. Yaj mej k´oponbey kajwaltik te yakuk ayinex ta jtojoltik jich te balumilale ya me ch´uun te ja´at ja tikunejontek.
->>>>>>> bbc9ad6dc09435abc487acd3805b0adbff76593f
+\v 20 Ma´ jauk nax ya jt´oponbey kajwaltik in to, ja´ nix jichuuk te mach´atik la xch´unik te  jk´ope. \v 21 Jich yu´un ta spisilik yumx mej yax xk´otik, jich te bit´il, jo´on ayon ta atojol. Yaj mej k´oponbey kajwaltik te yakuk ayinex ta jtojoltik jich te balumilale ya me ch´uun te ja´at ja tikunejontek.
\ No newline at end of file
diff --git a/17/25.txt b/17/25.txt
index bf11f7f9..bcbdc6a9 100644
--- a/17/25.txt
+++ b/17/25.txt
@@ -1 +1 @@
-\v 25 \v 26 Itat te ja´at tojate, ma sna´bataba te balumilale, te jo´one ya najbajtaba; sok ya snaikuk te ja´at la tikunintele. Jo´on jkak´oj te yansnabat ataik, jo´onix ya jk´ak ta nael tojol te xk´uxulawot´an awojk´obe, jich me ya x-ainon ta stojolikuk''.
\ No newline at end of file
+\v 25 Itat te ja´at tojate, ma sna´bataba te balumilale, te jo´one ya najbajtaba; sok ya snaikuk te ja´at la tikunintele. \v 26 Jo´on jkak´oj te yansnabat ataik, jo´onix ya jk´ak ta nael tojol te xk´uxulawot´an awojk´obe, jich me ya x-ainon ta stojolikuk''.
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index ebd8e46c..7ebc49ea 100644
--- a/manifest.json
+++ b/manifest.json
@@ -364,6 +364,10 @@
 		"17-12",
 		"17-15",
 		"17-18",
+		"17-20",
+		"17-22",
+		"17-24",
+		"17-25",
 		"18-title",
 		"18-01",
 		"18-04",
@@ -424,7 +428,6 @@
 		"21-19",
 		"21-20",
 		"21-22",
-		"21-24",
-		"17-22"
+		"21-24"
 	]
 }
\ No newline at end of file