diff --git a/25/title.txt b/25/title.txt
index 0e26984..f36a4ca 100644
--- a/25/title.txt
+++ b/25/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-As-hah 25
-=======
-As-hah
->>>>>>> f0eacb0063cbfcb9ec5aa5dcefaf7e17b17e2d72
+As-hah 25
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index ec1edb5..71ef8ec 100644
--- a/manifest.json
+++ b/manifest.json
@@ -420,6 +420,7 @@
 		"24-43",
 		"24-45",
 		"24-48",
+		"25-title",
 		"25-01",
 		"25-05",
 		"25-07",