diff --git a/front/title.txt b/front/title.txt
index f3dd813..a6a3d10 100644
--- a/front/title.txt
+++ b/front/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Filemon
-=======
-FILEMON
->>>>>>> 58e54ae93713cd5a16e0cf2e723378019ad39aa4
+Filemon
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index a61be6e..e353c18 100644
--- a/manifest.json
+++ b/manifest.json
@@ -34,7 +34,8 @@
 	"parent_draft": {},
 	"translators": [
 		"Ibi",
-		"Suhartono"
+		"Suhartono",
+		"dayakibanempran"
 	],
 	"finished_chunks": [
 		"01-title",