diff --git a/05/01.txt b/05/01.txt
index 3b7ce30..03c1e25 100644
--- a/05/01.txt
+++ b/05/01.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 1 \v 2 From fridom blong kraes imekem yumi fri,
-=======
-\c 5 \v 1 Kraes hemi mekem yumi blong bambae yumi kam ol free man. Nao from samting, yufala i mas stanap strong oltaem olsem ol free man. Mo yufala i no liv olsem man we hemi stap unda long loa we i fasem olgeta olsem oli slef bageken. \v 2 Yufala i luk. Mi Pol, mi stap talem long yufala se sipos yufala i mekem sekomsaes long yufala olsem we loa ia i talem, bambae kraes i no givhan long yufala natting.
->>>>>>> 792892f79bb32f65e5a799d01f32641cd8448570
+\c 5 \v 1 Kraes hemi mekem yumi blong bambae yumi kam ol free man. Nao from samting, yufala i mas stanap strong oltaem olsem ol free man. Mo yufala i no liv olsem man we hemi stap unda long loa we i fasem olgeta olsem oli slef bageken. \v 2 Yufala i luk. Mi Pol, mi stap talem long yufala se sipos yufala i mekem sekomsaes long yufala olsem we loa ia i talem, bambae kraes i no givhan long yufala natting.
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 927b214..0529453 100644
--- a/manifest.json
+++ b/manifest.json
@@ -34,7 +34,8 @@
 	"parent_draft": {},
 	"translators": [
 		"Edith",
-		"Henry"
+		"Henry",
+		"Talo"
 	],
 	"finished_chunks": [
 		"02-title",
@@ -63,6 +64,7 @@
 		"04-28",
 		"04-30",
 		"05-title",
+		"05-01",
 		"05-03",
 		"05-05",
 		"05-09",