diff --git a/LICENSE.md b/LICENSE.md
index 31b1c9c..69b466f 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,4 +1,5 @@
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 ## Creative Commons Attribution-ShareAlike 4.0 International
@@ -42,6 +43,8 @@ This PDF was generated using Prince (https://www.princexml.com/).
 =======
 =======
 >>>>>>> 0d1f5a4f0a6fded0c849dc8fdff905247bb6edda
+=======
+>>>>>>> 2a20cf0ba8f942b9afaf03ebf0457f406b2ffae4
 # License
 ## Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)
 
@@ -69,6 +72,9 @@ You do not have to comply with the license for elements of the material in the p
 
 No warranties are given. The license may not give you all of the permissions necessary for your intended use. For example, other rights such as publicity, privacy, or moral rights may limit how you use the material.
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 106916019464594bd7b0566041a551d95782fb9a
 =======
 >>>>>>> 0d1f5a4f0a6fded0c849dc8fdff905247bb6edda
+=======
+>>>>>>> 2a20cf0ba8f942b9afaf03ebf0457f406b2ffae4
diff --git a/front/title.txt b/front/title.txt
index 100e169..e0ff61f 100644
--- a/front/title.txt
+++ b/front/title.txt
@@ -1 +1,5 @@
-MATIUS
\ No newline at end of file
+<<<<<<< HEAD
+MATIUS
+=======
+Matius
+>>>>>>> 2a20cf0ba8f942b9afaf03ebf0457f406b2ffae4
diff --git a/manifest.json b/manifest.json
index e3c14ba..77c7b81 100644
--- a/manifest.json
+++ b/manifest.json
@@ -35,7 +35,8 @@
 	"translators": [
 		"bakati_rara",
 		"dewijunita",
-		"ester"
+		"ester",
+		"t"
 	],
 	"finished_chunks": [
 		"04-title",
@@ -128,7 +129,6 @@
 		"03-10",
 		"03-13",
 		"03-16",
-		"front-title",
 		"01-title",
 		"01-01",
 		"01-04",