diff --git a/12/07.txt b/12/07.txt
index 2736ecd..e79ed36 100644
--- a/12/07.txt
+++ b/12/07.txt
@@ -1,7 +1 @@
-<<<<<<< HEAD
-\v 7 dahpiyak, upaok, suhang malaikat Allah Tala bedihi dampin Petrus lalu cahaya bepencah dalam humah panis yak, dahpiyak malaikat yak nepuk higa Petrus dua nguas iya, ngau bannae,"ligas Thuas!" Dahpiyak, hantai-hantai yak telepas dahi kedua jahi iya. \v 8 Dahpiyak, malaikat yak bannae kanaok iya, "ketanglah punggung nuan dahyak pakailah selup nuan." dahpiyak, iya mulah mudil yak. Dahpiyak, iya bannae kanaok iya, " pakailah mantil nuan lalu ngimbae aku!"
-=======
-\v 7 dahpiyak, upok suhang malaikat Tuhan bedihi damping Petrus dan cahaya bepencah dalam sil, dahpiyak malaikat nepuk husuk petrus Dan nguas iya, sambil bannae,"ligas, angkat!" Dan, hantai jatuh dahi jahi iya.
- \v 8 dahpiyak, malaikat bannae kanaok iya, "ikat pinggang u dua pakai selup nuan." Dan iya nuhut magang.
-Dahpiyak, iya bannae kanaok iya, pakai jubah nuan dan ngimmae aku!".
->>>>>>> d5ec9c126908860f8d32395d73c3221106749477
+\v 7 dahpiyak, upaok, suhang malaikat Allah Tala bedihi dampin Petrus lalu cahaya bepencah dalam humah panis yak, dahpiyak malaikat yak nepuk higa Petrus dua nguas iya, ngau bannae,"ligas Thuas!" Dahpiyak, hantai-hantai yak telepas dahi kedua jahi iya. \v 8 Dahpiyak, malaikat yak bannae kanaok iya, "ketanglah punggung nuan dahyak pakailah selup nuan." dahpiyak, iya mulah mudil yak. Dahpiyak, iya bannae kanaok iya, " pakailah mantil nuan lalu ngimbae aku!"
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 5b4ded8..4b999cb 100644
--- a/manifest.json
+++ b/manifest.json
@@ -170,6 +170,7 @@
 		"10-44",
 		"10-46",
 		"11-01",
+		"11-11",
 		"11-15",
 		"11-17",
 		"11-19",
@@ -199,6 +200,7 @@
 		"13-21",
 		"13-23",
 		"13-26",
+		"13-28",
 		"13-30",
 		"13-32",
 		"13-35",