diff --git a/01/01.txt b/01/01.txt
index c5ed51c..b818e28 100644
--- a/01/01.txt
+++ b/01/01.txt
@@ -1 +1,5 @@
-\c 1 \v 1 \v 2 Conflict Parsing Error
\ No newline at end of file
+<<<<<<< HEAD
+\c 1 \v 1 \v 2 Conflict Parsing Error
+=======
+\c 1 \v 1 Kopieya matakabi Dioso itsi itabojjo yajawa ira. \v 2 Ira itsakuena apojjenae. Itakiri nakua irajawata itasa dajjita. Dioso pe jamatabukuene saya nuka najenaejaeba mera jawata.
+>>>>>>> 421fe0b0aeb3aaad9946b1845845d14caed99ca6
diff --git a/manifest.json b/manifest.json
index 837807b..8035cba 100644
--- a/manifest.json
+++ b/manifest.json
@@ -37,7 +37,8 @@
 		"wendyc",
 		"Gabrielsanchez",
 		"wilsonalbaritorodriguez",
-		"Mercedes_Romero"
+		"Mercedes_Romero",
+		"Joseeliezerr123"
 	],
 	"finished_chunks": [
 		"front-title",