diff --git a/01/05.txt b/01/05.txt
index 5a468a8..1b34750 100644
--- a/01/05.txt
+++ b/01/05.txt
@@ -1 +1,5 @@
-\v 5 Pulaksanai sa na sintaku, naun tatap ngaraja anri setia katuluh usaha naun ma kawan pulaksanai sa lain, biar here yiru ulun sa puang naun kataru. haut iwara neu sintanu hadapan ungkup. \v 6 Naun haut ngaraja hal sa maeh, hantek naun ngarawah here nampalus pakiaan here makai sara sa na maeh hadapa Alatalla Amah. \v 7 Daya here haut tulak makai Ngaran yiru, pada mahi narime inunpun teka kawan ulun sa puang parisaya. \v 8 Daya yiru takam harus ngarawah kawan ulun sa iyalah here yiru hampan tau jari hengau pelayanan neu kapinuuni.
\ No newline at end of file
+<<<<<<< HEAD
+\v 5 Pulaksanai sa na sintaku, naun tatap ngaraja anri setia katuluh usaha naun ma kawan pulaksanai sa lain, biar here yiru ulun sa puang naun kataru. haut iwara neu sintanu hadapan ungkup. \v 6 Naun haut ngaraja hal sa maeh, hantek naun ngarawah here nampalus pakiaan here makai sara sa na maeh hadapa Alatalla Amah. \v 7 Daya here haut tulak makai Ngaran yiru, pada mahi narime inunpun teka kawan ulun sa puang parisaya. \v 8 Daya yiru takam harus ngarawah kawan ulun sa iyalah here yiru hampan tau jari hengau pelayanan neu kapinuuni.
+=======
+\v 5 Pulaksanai sa na sintaku, naun tatap ngaraja anri setia katuluh usaha naun ma kawan pulaksanai sa lain, biar here yiru ulun sa puang naun kataru. \v Here haut iwara neu sintanu hadapan ungkup. Naun haut ngaraja hal sa maeh, hantek naun ngarawah here nampalus pakiaan here makai sara sa na maeh hadapa Alatalla Amah. \v 7 Daya here haut tulak makai Ngaran yiru, pada mahi narime inunpun teka kawan ulun sa puang parisaya. \v 8 Daya yiru takam harus ngarawah kawan ulun sa iyalah here yiru hampan tau jari hengau pelayanan neu kapinuuni.
+>>>>>>> 9d0b1e2304a66d3441d73ee04c8d9d72be37bc5a
diff --git a/LICENSE.md b/LICENSE.md
index 98f733d..b93894a 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -2,7 +2,11 @@
 # License
 ## Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)
 
+<<<<<<< HEAD
 This is a human-readable summary of (and not a substitute for) the full license found at http://creativecommons.org/licenses/by-sa/4.0/.
+=======
+This is a human-readable summary of (and not a substitute for) the [license](http://creativecommons.org/licenses/by-sa/4.0/).
+>>>>>>> 9d0b1e2304a66d3441d73ee04c8d9d72be37bc5a
 
 ### You are free to:
 
@@ -25,5 +29,8 @@ The licensor cannot revoke these freedoms as long as you follow the license term
 You do not have to comply with the license for elements of the material in the public domain or where your use is permitted by an applicable exception or limitation.
 
 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
 
 This PDF was generated using Prince (https://www.princexml.com/).
+=======
+>>>>>>> 9d0b1e2304a66d3441d73ee04c8d9d72be37bc5a
diff --git a/manifest.json b/manifest.json
index cf1440a..b6997a4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -33,13 +33,13 @@
 	],
 	"parent_draft": {},
 	"translators": [
-		"bahasatech.indobarat"
+		"bahasatech.indobarat",
+		"Lukasari"
 	],
 	"finished_chunks": [
 		"front-title",
 		"01-title",
 		"01-01",
-		"01-05",
 		"01-09",
 		"01-11",
 		"01-13"