diff --git a/25/01.txt b/25/01.txt
index 1e75c5b..d638784 100644
--- a/25/01.txt
+++ b/25/01.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\c 25 \v 1 Echali echi waluala riwigachi ni chikio ir ju echi makoy mukui mapi kie machime bile rijoi mapali chapili echi rajekuami na simibali riwisia echi niwiame. \v 2 mali echi nili kie natami na mali echi nili we kala natami \v 3 chopi mapali echi muki machimi nili echi rijoi kie natami chapili echi rajekuami   echi kie otoli  echi i'i echi yua \v 4 chopi echi mukui kie machime echi rijoi, we natami  otoli echi i'i  bilen ta bulli ratabami  napawiku echi rajekuami, yuwa,
-=======
-\c 25 \v 1 Echali echi wualula riwigachi ni chikio ir ju echi makoi mukui mapo kie muchimi nili bile rijoi mapuli chapili echi rajekuami y na simivili risua emi niwichajuami. \v 2 Mali echi nili kie natami na mali echi we kala natami. \v 3 Chopi mapali echi muki kie machimi nili echi rijoi kie natami chapili echi rajekuami echi kie otoli echi ywa. \v 4 Chopi echi mukui kie machini echi rijoi, we natami otoli echi i bilen tu buli tatabami napawiku echi rajekuami, yuwa.
->>>>>>> 334236e062ba117b9a26e85a592f4e2a2905b22e
+\c 25 \v 1 Echali echi wualula riwigachi ni chikio ir ju echi makoi mukui mapo kie muchimi nili bile rijoi mapuli chapili echi rajekuami y na simivili risua emi niwichajuami. \v 2 Mali echi nili kie natami na mali echi we kala natami. \v 3 Chopi mapali echi muki kie machimi nili echi rijoi kie natami chapili echi rajekuami echi kie otoli echi ywa. \v 4 Chopi echi mukui kie machini echi rijoi, we natami otoli echi i bilen tu buli tatabami napawiku echi rajekuami, yuwa.
\ No newline at end of file
diff --git a/25/05.txt b/25/05.txt
index 89ab46a..245d680 100644
--- a/25/05.txt
+++ b/25/05.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 5 mapali echi niwime kie ikirli  karka, echi ma kuchinali nia kochili \v 6 chopi a nasiparokogo namli  bile waali ra'ichami. na jeani: ¡inesi, echi niwiame! buwasi mapu ruboti echi.
-=======
-\v 5 \v 6 Mapali echi niwilkami kie ikirli karka, echi ma kuchinoli y na cochili. Chopi a nuciparokago namli bile waali raikake nu jeani: !inesi echi niwuanee! buwasi mapu rubatiechi.
->>>>>>> 334236e062ba117b9a26e85a592f4e2a2905b22e
+\v 5 Mapali echi niwilkami kie ikirli karka, echi ma kuchinoli y na cochili. \v 6 Chopi a nuciparokago namli bile waali raikake nu jeani: !inesi echi niwuanee! buwasi mapu rubatiechi.
\ No newline at end of file
diff --git a/25/07.txt b/25/07.txt
index 4b184e9..08db202 100644
--- a/25/07.txt
+++ b/25/07.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 7 echali echi karka muki mapu ketasi machimi nili bile rijoi, m'uchisali kalarli echi rajekuami \v 8 echi kie natami jeaneli  echi kala natami: yasi  tami peta i'i  mapurika tamuje niwala ma suwiba inari \v 9 chopi echi  la natami ko jeaneli jeanika kie nirulma ni siebali tamuje niwali, yemi simibaka mapona ralinewi ina ralisu i'i yemi niwala.
-=======
-\v 7 \v 8 \v 9 Echali echi karka muki mapu kie machini nili echi rijoi: muchisali ali kularli
->>>>>>> 334236e062ba117b9a26e85a592f4e2a2905b22e
+\v 7 echali echi karka muki mapu ketasi machimi nili bile rijoi, m'uchisali kalarli echi rajekuami \v 8 echi kie natami jeaneli  echi kala natami: yasi  tami peta i'i  mapurika tamuje niwala ma suwiba inari \v 9 chopi echi  la natami ko jeaneli jeanika kie nirulma ni siebali tamuje niwali, yemi simibaka mapona ralinewi ina ralisu i'i yemi niwala.
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 196f0f6..c408e51 100644
--- a/manifest.json
+++ b/manifest.json
@@ -410,7 +410,22 @@
 		"24-12",
 		"24-15",
 		"24-19",
+		"24-23",
+		"24-26",
+		"24-29",
+		"24-30",
+		"24-32",
+		"24-34",
+		"24-36",
+		"24-37",
+		"24-40",
+		"24-43",
+		"24-45",
+		"24-48",
 		"25-title",
+		"25-01",
+		"25-05",
+		"25-07",
 		"25-10",
 		"25-14",
 		"25-17",
@@ -473,6 +488,7 @@
 		"27-43",
 		"27-45",
 		"27-48",
+		"27-51",
 		"28-title",
 		"28-01",
 		"28-03",
@@ -482,19 +498,6 @@
 		"28-14",
 		"28-16",
 		"28-18",
-		"28-20",
-		"24-23",
-		"24-26",
-		"24-29",
-		"24-30",
-		"24-32",
-		"24-34",
-		"24-36",
-		"24-37",
-		"24-40",
-		"24-43",
-		"24-45",
-		"24-48",
-		"27-51"
+		"28-20"
 	]
 }
\ No newline at end of file