diff --git a/01/03.txt b/01/03.txt
index 7096571..84d0eec 100644
--- a/01/03.txt
+++ b/01/03.txt
@@ -1,6 +1,10 @@
+<<<<<<< HEAD
 \v 3 I thank my God with every thought of you,
 \v 4 Every time I pray for you, it is always a prayer of joy.
 \v 5 I give thanks for your fellowship in the gospel from the first day until now.
 \v 6 I am confident of this very thing, that he who began a good work in you will complete it until the day of Jesus Christ.
 
 
+=======
+\v 3 I thank my God with every thought of you, \v 4 Every time I pray for you, it is always a prayer of joy. \v 5 I give thanks for your fellowship in the gospel from the first day until now. \v 6 I am confident of this very thing, that he who began a good work in you will complete it until the day of Jesus Christ.
+>>>>>>> 9c846c36e6fe1e25e3849ebdd67b244a745ec9f8
diff --git a/01/07.txt b/01/07.txt
index 7efb502..d96f6a2 100644
--- a/01/07.txt
+++ b/01/07.txt
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 \v 7 It is right for me to feel this way about all of you because I have you in my heart. You all have been my partners in grace both in my imprisonment and in my defense and confirmation of the gospel.
 \v 8 For God is my witness, how I long after you all in the depths of the love of Christ Jesus.
 
 
+=======
+\v 7 It is right for me to feel this way about all of you because I have you in my heart. You all have been my partners in grace both in my imprisonment and in my defense and confirmation of the gospel. \v 8 For God is my witness, how I long after you all in the depths of the love of Christ Jesus.
+>>>>>>> 9c846c36e6fe1e25e3849ebdd67b244a745ec9f8
diff --git a/LICENSE.md b/LICENSE.md
index 5ae62ec..37c872b 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 ## License:
 
 This work is made available under a Creative Commons Attribution-ShareAlike 4.0 International License (http://creativecommons.org/licenses/by-sa/4.0/).
@@ -13,3 +14,34 @@ This work is made available under a Creative Commons Attribution-ShareAlike 4.0
 **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.
+=======
+
+# 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 full license found at 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.
+
+This PDF was generated using Prince (https://www.princexml.com/).
+>>>>>>> 9c846c36e6fe1e25e3849ebdd67b244a745ec9f8
diff --git a/front/title.txt b/front/title.txt
new file mode 100644
index 0000000..4f3766b
--- /dev/null
+++ b/front/title.txt
@@ -0,0 +1 @@
+Philippians
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 77af70c..b99a0e2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -32,5 +32,6 @@
 			"date_modified": 20160614,
 			"version": "5"
 		}
-	]
+	],
+	"finished_chunks": []
 }
\ No newline at end of file