diff --git a/01/01.txt b/01/01.txt
index 58e8a54..10fb120 100644
--- a/01/01.txt
+++ b/01/01.txt
@@ -1 +1,5 @@
-\c 1 \v 1 Paul and Timothy, servants of Christ Jesus, to all those set apart in Christ Jesus who are at Philippi, with the overseers and deacons. \v 2 Grace to you and peace from God our Father and the Lord Jesus Christ.
\ No newline at end of file
+<<<<<<< HEAD
+\c 1 \v 1 Paul and Timothy, servants of Christ Jesus, to all those set apart in Christ Jesus who are at Philippi, with the overseers and deacons. \v 2 Grace to you and peace from God our Father and the Lord Jesus Christ.
+=======
+Paul and Timothy
+>>>>>>> 54c6337b5524ebf945c2f19c7061a530030f6373
diff --git a/LICENSE.md b/LICENSE.md
index 2cadbf0..ae02a44 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 
 # License
 ## Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)
@@ -25,3 +26,20 @@ 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.
+=======
+## License:
+
+This work is made available under a Creative Commons Attribution-ShareAlike 4.0 International 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.
+
+### 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.
+>>>>>>> 54c6337b5524ebf945c2f19c7061a530030f6373