diff --git a/01/01.txt b/01/01.txt
index bea1d6c..4ff5334 100644
--- a/01/01.txt
+++ b/01/01.txt
@@ -1 +1,5 @@
-\c 1 (Salam jak Paulus) \v 1 Jak Paulus, nyo menjadiko rasul bukon kerena mendesio apo melalui mendesio, meloinko melalui Kristus Yesus ngan Allah Bepa nyo membangketko Enye deri antaro urang mati. \v 2 upa, deri segelo dolor seiman nyo besamo-samo ngan ake, ontok jemaat-jemaat de Galatia.
\ No newline at end of file
+<<<<<<< HEAD
+\c 1 (Salam jak Paulus) \v 1 Jak Paulus, nyo menjadiko rasul bukon kerena mendesio apo melalui mendesio, meloinko melalui Kristus Yesus ngan Allah Bepa nyo membangketko Enye deri antaro urang mati. \v 2 upa, deri segelo dolor seiman nyo besamo-samo ngan ake, ontok jemaat-jemaat de Galatia.
+=======
+( Salam Jak Paulus) \v 1 Jak Paulus nyo lah de jedi ko Rasul bukon kereno mendesio, meloinko melalui Kristus Yesus ngan Allah Bepa nyo membangket ko Nye jak urang mati.\v 2 Jugo, jak segelo dolor seiman nyo besamo-samo dengan ke, ontok jemaat de Galatia.
+>>>>>>> aaf35cc05bafdf10393e210070baa9c8430def32
diff --git a/01/03.txt b/01/03.txt
index 8c9a426..e868097 100644
--- a/01/03.txt
+++ b/01/03.txt
@@ -1 +1,5 @@
-\v 3 Anugerah damoi sejahtera bage kowe deri Allah Bepa kite ngan Tuhan Yesus Kristus, \v 4 nyo lah m'boriko diri-Nye bage doso-doso kite ontok menyelamatko kite deri zaman nyo jahat kinie sesuoi ngan kehendak Allah ngan Bepa kite. \v 5 Bagi Nyelah kemuliaon ontok selamo-lamonye. Amin. Hanyo ado sikok Injil.
\ No newline at end of file
+<<<<<<< HEAD
+\v 3 Anugerah damoi sejahtera bage kowe deri Allah Bepa kite ngan Tuhan Yesus Kristus, \v 4 nyo lah m'boriko diri-Nye bage doso-doso kite ontok menyelamatko kite deri zaman nyo jahat kinie sesuoi ngan kehendak Allah ngan Bepa kite. \v 5 Bagi Nyelah kemuliaon ontok selamo-lamonye. Amin. Hanyo ado sikok Injil.
+=======
+\v 3 Anugerah ngan damai sejahtera bage me jak Allah Bepa kite ngan Tuhan Yesus Kristus. \v 4 Nye lah memboriko diri-Nye bage doso- doso kite ontok menyelamat ko kite jak zaman nyo jahat kinie sesuoi dengan kehendak Allah ngan Bepa kite. \v 5 Bage Enye lah kemuliaon ontok selamo- lamo nye. Amin. Anyo ado sikuk Injill.
+>>>>>>> aaf35cc05bafdf10393e210070baa9c8430def32
diff --git a/01/title.txt b/01/title.txt
index 9d90cd9..c7a8c73 100644
--- a/01/title.txt
+++ b/01/title.txt
@@ -1 +1,5 @@
-Pasal 1
\ No newline at end of file
+<<<<<<< HEAD
+Pasal 1
+=======
+Pasal 1: 1-24
+>>>>>>> aaf35cc05bafdf10393e210070baa9c8430def32
diff --git a/LICENSE.md b/LICENSE.md
index d31d4f9..0bb156c 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,4 +1,5 @@
 
+<<<<<<< HEAD
 ## Creative Commons Attribution-ShareAlike 4.0 International
 
 ### Human-Readable Summary 
@@ -36,4 +37,32 @@ http://creativecommons.org/licenses/by-sa/4.0/.
 
   
 
-This PDF was generated using Prince (https://www.princexml.com/).
\ No newline at end of file
+This PDF was generated using Prince (https://www.princexml.com/).
+=======
+# License
+## Creative Commons Attribution-ShareAlike 4.0 International (CC 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/).
+
+### You are free to:
+
+  * **Share** — copy and redistribute the material in any medium or format
+  * **Adapt** — remix, transform, and build upon the material 
+
+for any purpose, even commercially.
+
+The licensor cannot revoke these freedoms as long as you follow the license terms.
+
+### Under the following conditions:
+
+  * **Attribution** — You must attribute the work as follows: "Original work available at https://door43.org/." Attribution statements in derivative works should not in any way suggest that we endorse you or your use of this work.
+  * **ShareAlike** — If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original.
+
+**No additional restrictions** — You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits.
+
+### Notices:
+
+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.
+>>>>>>> aaf35cc05bafdf10393e210070baa9c8430def32
diff --git a/front/title.txt b/front/title.txt
index 3e3a249..e4c7708 100644
--- a/front/title.txt
+++ b/front/title.txt
@@ -1 +1,5 @@
-GALATIA
\ No newline at end of file
+<<<<<<< HEAD
+GALATIA
+=======
+Galatia
+>>>>>>> aaf35cc05bafdf10393e210070baa9c8430def32
diff --git a/manifest.json b/manifest.json
index 17ffe9c..cac16af 100644
--- a/manifest.json
+++ b/manifest.json
@@ -33,13 +33,10 @@
 	],
 	"parent_draft": {},
 	"translators": [
-		"kvb-anakdalam"
+		"kvb-anakdalam",
+		"j"
 	],
 	"finished_chunks": [
-		"front-title",
-		"01-title",
-		"01-01",
-		"01-03",
 		"01-06",
 		"01-08",
 		"01-11",