diff --git a/18/01.txt b/18/01.txt
index 19e3d21..18c90a0 100644
--- a/18/01.txt
+++ b/18/01.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\c 18 \v 1 Echali jonsa Binoi binierka namuti rukua echi auche jare aneli mapu chorika Ra´ichama Riosi Yuwa sinibi rawe, ali kie sine siweka, \v 2 jeanika: "bitieli a Bilen wika rijoachi, bile bacha chukumi raichali akarewam mapu j¡kie majam nili Riosi ali kie Ala kuwirami echi auche jare pakotami"
-=======
-\c 18 \v 1 Ali binoi nijali jare raichala echi chulubi tanma na ketasi ku kuwana ku wichiwame. \v 2 Aniga: "niruli bile loichiwali siudachi ali bile bichiwali bacha chikume nopi ketasi majali Riosi ali ketasi nijewiga nokulí aboni ralamili kaa.
->>>>>>> 3be323c3770073485147bbf80161a76cd9c581ab
+\c 18 \v 1 \v 2 Conflict Parsing Error
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index f2934db..ea202e6 100644
--- a/manifest.json
+++ b/manifest.json
@@ -304,6 +304,7 @@
 		"16-29",
 		"17-title",
 		"17-01",
+		"17-03",
 		"17-05",
 		"17-07",
 		"17-09",
@@ -319,7 +320,6 @@
 		"17-34",
 		"17-37",
 		"18-title",
-		"18-01",
 		"18-03",
 		"18-06",
 		"18-09",