diff --git a/06/26.txt b/06/26.txt
index 377d627..013119c 100644
--- a/06/26.txt
+++ b/06/26.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 26   \v 27 \v 28 \v 29 Bayekoli Bayowani bakokoka oyo, baakasila molonda bokatahi aliana
-=======
-\v 26 Kumi akoka bowa, kasi po e bosembi bo ahe pe e bafaya etsi kundji bofetsi. \v 27 Aka toma mbala emoyi mosengia ilongo la motoma u botoli moto u Yoane Mobatisi. \v 28 Mosengia ilongo aka kia bo ka teni Yoane moto a mbele e linga, pe aka tola moto likolo li lofefe, aka aesa mona owali pe mona owali aka aesa inena.
->>>>>>> 83552f53bf1fab53b06e91e2aa7b086c9bcd4df4
+\v 29 \v 26 Kumi akoka bowa, kasi po e bosembi bo ahe pe e bafaya etsi kundji bofetsi. \v 27 Aka toma mbala emoyi mosengia ilongo la motoma u botoli moto u Yoane Mobatisi. \v 28 Mosengia ilongo aka kia bo ka teni Yoane moto a mbele e linga, pe aka tola moto likolo li lofefe, aka aesa mona owali pe mona owali aka aesa inena.
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 2eb2bed..5710399 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,17 +1,10 @@
 {
-	"project": {
-		"id": "mrk",
-		"name": ""
-	},
-	"type": {
-		"id": "text",
-		"name": "Text"
-	},
+	"package_version": 7,
+	"format": "usfm",
 	"generator": {
 		"name": "ts-desktop",
 		"build": "2"
 	},
-	"package_version": 7,
 	"target_language": {
 		"name": "Mbesa",
 		"direction": "ltr",
@@ -20,22 +13,30 @@
 		"is_gateway_language": false,
 		"id": "zms"
 	},
-	"format": "usfm",
+	"project": {
+		"id": "mrk",
+		"name": "Mark"
+	},
+	"type": {
+		"id": "text",
+		"name": "Text"
+	},
 	"resource": {
 		"id": "reg"
 	},
-	"translators": [
-		"faustin-azaza"
-	],
 	"source_translations": [
 		{
 			"language_id": "en",
 			"resource_id": "ulb",
 			"checking_level": "3",
-			"date_modified": 20170329,
-			"version": "9"
+			"date_modified": "2017-11-29T00:00:00+00:00",
+			"version": "12"
 		}
 	],
+	"translators": [
+		"faustin-azaza",
+		"garryg"
+	],
 	"finished_chunks": [
 		"04-21",
 		"04-24",