diff --git a/LICENSE.md b/LICENSE.md
index 2cadbf0..a2f28ae 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.
+>>>>>>> refs/heads/new
diff --git a/front/title.txt b/front/title.txt
index 2f24dbe..9df9de9 100644
--- a/front/title.txt
+++ b/front/title.txt
@@ -1 +1 @@
-Yubu
\ No newline at end of file
+Yubu
diff --git a/manifest.json b/manifest.json
index 156f598..73fbcd6 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1 +1 @@
-{"project":{"id":"job","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":3},"package_version":7,"target_language":{"name":"Havu","direction":"ltr","anglicized_name":"Havu","region":"Africa","is_gateway_language":false,"id":"hav"},"format":"usfm","resource":{"id":"reg"},"translators":["faustin-azaza"],"source_translations":[{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"}],"finished_chunks":["front-title","01-title","02-title"]}
\ No newline at end of file
+{"project":{"id":"job","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":3},"package_version":7,"target_language":{"name":"Havu","direction":"ltr","anglicized_name":"Havu","region":"Africa","is_gateway_language":false,"id":"hav"},"format":"usfm","resource":{"id":"reg"},"translators":["faustin-azaza"],"source_translations":[{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"},{"language_id":"en","resource_id":"ulb","checking_level":3,"date_modified":20160614,"version":"5"}],"finished_chunks":["01-title","02-title","00-title","front-title"]}
\ No newline at end of file