diff --git a/05/01.txt b/05/01.txt
index 69402fb9..69e191bf 100644
--- a/05/01.txt
+++ b/05/01.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\c 5 \v 1 Akgxni wakg xa napuxkún xa lakg Amorreos xapaxtutu kgalhtuchokgo Jordán anta niku takgnú chichiní chu wakg xa napuxkún Cananeos tiku xtawilanalh nakg xkilhapan pupunú Mediterráneo takgaxmatli xlakata PUCHINA xmaskakanit chuchut xa la kgaltuchokgo Jordán chuna kachikín xla Israel ta patakutli xa kilhtutu, xnakugkan talitzamalh tajikua chu yaj xtalachipaputún, xpalakata kachikin Israel.
-=======
-\c 5 \v 1 1 Akgxni wakg xa napuxkún xa lakg Amorreos  anta nakj xpaxtún takgnú chichiní kgalhtuchokgo Jordán anta niku takgnú chichiní chu wakg xa napuxkún Cananeos tiku xtawilanalh nakg xkilhapan pupunú Mediterráneo takgaxmatli xlakata PUCHINA xmaskakanit chuchut xa la kgaltuchokgo Jordán chuna kachikín xla Israel ta patakutli xa´kilhtutu, xnakugkan talitzamalh tajikua chu yaj xtalachipaputún, xpalakata kachikin Israel.
->>>>>>> 89a81c91b052d256ba45aae441aae4ce9d82561c
+\c 5 \v 1 Akgxni wakg xa napuxkún xa lakg Amorreos xapaxtutu kgalhtuchokgo Jordán anta niku takgnú chichiní chu wakg xa napuxkún Cananeos tiku xtawilanalh nakg xkilhapan pupunú Mediterráneo takgaxmatli xlakata PUCHINA xmaskakanit chuchut xa la kgaltuchokgo Jordán chuna kachikín xla Israel ta patakutli xa kilhtutu, xnakugkan talitzamalh tajikua chu yaj xtalachipaputún, xpalakata kachikin Israel.
\ No newline at end of file
diff --git a/05/08.txt b/05/08.txt
index 6e9113b0..2ad71c0f 100644
--- a/05/08.txt
+++ b/05/08.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 8 akxni wakg kachukúka xtiyat liwa, tamakgxtakgkgolh anta nakj xakgstitlápan antá niku wakg ta paksli. \v 9 chu wa PUCHINA wánilh Josué: "Jaé chichiní AKIT jmakganunít tasipánit xla Egipto neje wixin xlitanátit".chuná lilakgapaskan amá tiyat Gilgal lata lachí.
-=======
-\v 8 \v 9 8 akxni wakg kachukúka xtiyat liwa, tamakgxtakgkgolh anta nakj xakgstitlánpan antá niku wakg ta paksli. 9 chu wa PUCHINA wánilh Josué: "Jaé chichiní AKIT jmakganunít tasipánit xla Egipto neje wixin xlitanátit".chuná lilakgapaskan amá tiyat Gilgal lata lachí.
->>>>>>> 89a81c91b052d256ba45aae441aae4ce9d82561c
+\v 8 akxni wakg kachukúka xtiyat liwa, tamakgxtakgkgolh anta nakj xakgstitlápan antá niku wakg ta paksli. \v 9 chu wa PUCHINA wánilh Josué: "Jaé chichiní AKIT jmakganunít tasipánit xla Egipto neje wixin xlitanátit".chuná lilakgapaskan amá tiyat Gilgal lata lachí.
\ No newline at end of file
diff --git a/05/10.txt b/05/10.txt
index 139cd337..d7b661d2 100644
--- a/05/10.txt
+++ b/05/10.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 10 Xkachikin Israel tawlakgolh anta nakj Gilgal.tatlawalh paxkua xli akgkutati chichiní amá papa, xlismalankgan, akxni xtawilanalh anta xakaxtum Jericó. \v 11 amá chichiní akxni lalh Paxkua, ama chichiní, wakgólh tuku antá lananán nakj tiyat, kaxtilanchu neje ni kgalhí lixkútan, chu xaskawawa talhtsi.
-=======
-\v 10 \v 11 10 Xkachikin Israel tawlakgolh anta nakj Gilgal.tatlawalh paxkua xli akgkutati chichiní amá papa, xlismalankgan, akxni tilakgtankuwikgólh anta xakaxtum Jericó. 11 amá chichiní akxni lalh Paxkua, ama chichiní, wakgólh tuku antá lananán nakj tiyat, kaxtilanchu neje ni kgalhí lixkútan, chu xaskawawa talhtsi.
->>>>>>> 89a81c91b052d256ba45aae441aae4ce9d82561c
+\v 10 Xkachikin Israel tawlakgolh anta nakj Gilgal.tatlawalh paxkua xli akgkutati chichiní amá papa, xlismalankgan, akxni xtawilanalh anta xakaxtum Jericó. \v 11 amá chichiní akxni lalh Paxkua, ama chichiní, wakgólh tuku antá lananán nakj tiyat, kaxtilanchu neje ni kgalhí lixkútan, chu xaskawawa talhtsi.
\ No newline at end of file
diff --git a/05/13.txt b/05/13.txt
index f603c8df..0b679225 100644
--- a/05/13.txt
+++ b/05/13.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 13 akgxni Josué lakatsu xwí nakg Jericó, xlá lákalh talhmán chu lakawánalh, chu akxílhli chatúm chixkú tiku xyá antá xlakatín; chu xlikánat xchipanit nakj xmakán. Josué lákgalh chu wánilh: "¿Kin ka tapakgsiníya o tapakgsiníya kintaratlawnakán? "
-=======
-\v 13 13 akgxni Josué lakatsu xwí nakg Jericó, xlá lákalh talhmán chu lakawánalh, chu akxílhli chatúm chixkú tiku xyá antá xlakatín; chu  lhmán likánat xchipanit nakj xmakán. Josué lákgalh chu wánilh: "¿Kin ka tapakgsiníya o tapakgsiníya kintaratlawnakán? "
->>>>>>> 89a81c91b052d256ba45aae441aae4ce9d82561c
+\v 13 akgxni Josué lakatsu xwí nakg Jericó, xlá lákalh talhmán chu lakawánalh, chu akxílhli chatúm chixkú tiku xyá antá xlakatín; chu xlikánat xchipanit nakj xmakán. Josué lákgalh chu wánilh: "¿Kin ka tapakgsiníya o tapakgsiníya kintaratlawnakán? "
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 13fc035e..a6149cae 100644
--- a/manifest.json
+++ b/manifest.json
@@ -99,10 +99,14 @@
 		"04-19",
 		"04-22",
 		"05-title",
+		"05-01",
 		"05-02",
 		"05-04",
 		"05-06",
+		"05-08",
+		"05-10",
 		"05-12",
+		"05-13",
 		"05-14",
 		"06-title",
 		"06-01",
@@ -291,6 +295,16 @@
 		"18-21",
 		"18-25",
 		"19-title",
+		"19-01",
+		"19-02",
+		"19-05",
+		"19-08",
+		"19-10",
+		"19-12",
+		"19-14",
+		"19-17",
+		"19-20",
+		"19-23",
 		"19-24",
 		"19-27",
 		"19-29",
@@ -301,6 +315,7 @@
 		"19-43",
 		"19-47",
 		"19-49",
+		"19-51",
 		"20-title",
 		"20-01",
 		"20-04",
@@ -366,17 +381,6 @@
 		"24-27",
 		"24-29",
 		"24-31",
-		"24-32",
-		"19-01",
-		"19-02",
-		"19-05",
-		"19-08",
-		"19-10",
-		"19-12",
-		"19-14",
-		"19-17",
-		"19-20",
-		"19-23",
-		"19-51"
+		"24-32"
 	]
 }
\ No newline at end of file