From f9bb55f17a7ff915b52fa8477ce08e0a193842f2 Mon Sep 17 00:00:00 2001
From: tsDesktop <you@example.com>
Date: Tue, 18 Jul 2017 16:12:34 +0100
Subject: [PATCH] Tue Jul 18 2017 16:12:33 GMT+0100 (W. Central Africa Standard
 Time)

---
 01/title.txt    |  6 +-----
 front/title.txt |  6 +-----
 manifest.json   | 39 ++++++++++++++++++++-------------------
 3 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/01/title.txt b/01/title.txt
index 2c0fb849..fe3eb903 100644
--- a/01/title.txt
+++ b/01/title.txt
@@ -1,6 +1,2 @@
-<<<<<<< HEAD
-KILI 1
-=======
 LUKA
-Kili 1
->>>>>>> ea045937979617f713e57618d727e019609b1cfd
+Kili 1
\ No newline at end of file
diff --git a/front/title.txt b/front/title.txt
index daf8b985..6de2ed3b 100644
--- a/front/title.txt
+++ b/front/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-VII WUSNI GHƎ LUKA
-=======
-VI WUSNI GHƎ LUKA
->>>>>>> fa80522c15e6a88f2b2862dfe2f14d49cb166f3e
+VI WUSNI GHƎ LUKA
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index bc5fd8c2..370a4113 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,41 +1,42 @@
 {
-	"project": {
-		"id": "luk",
-		"name": ""
-	},
-	"type": {
-		"id": "text",
-		"name": "Text"
-	},
+	"package_version": 7,
+	"format": "usfm",
 	"generator": {
 		"name": "ts-desktop",
 		"build": "110"
 	},
-	"package_version": 7,
 	"target_language": {
 		"direction": "ltr",
 		"id": "say",
 		"name": "Saya"
 	},
-	"format": "usfm",
+	"project": {
+		"id": "luk",
+		"name": "Luke"
+	},
+	"type": {
+		"id": "text",
+		"name": "Text"
+	},
 	"resource": {
 		"id": "reg"
 	},
-	"translators": [
-		"manassah",
-		"cornelius funchong",
-		"zaar3-nig",
-		"bena4"
-	],
 	"source_translations": [
 		{
 			"language_id": "en",
 			"resource_id": "udb",
-			"checking_level": 3,
-			"date_modified": 20160614,
-			"version": "5"
+			"checking_level": "3",
+			"date_modified": 20161207,
+			"version": "8"
 		}
 	],
+	"translators": [
+		"manassah",
+		"cornelius funchong",
+		"zaar3-nig",
+		"bena4",
+		"Stephen Sam Patayaure"
+	],
 	"finished_chunks": [
 		"00-title",
 		"04-01",