diff --git a/18/01.txt b/18/01.txt
index 824ec2d..f96d65c 100644
--- a/18/01.txt
+++ b/18/01.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 1 Isalele yaaba kuli den taani ki kadi Silo dogu nni, ki bugini li kani u kadikaanu gbandieli. \v 2 Bi siiga buoli lele n den sieini kaa baa tinbiinu.
-=======
-\v 1 Isalele yaaba n den paadi mi diema, bi kuli den taani Silo dogu nni ki caani li kani u kadikaanu gbandieli. \v 2 Bi siiga buoli lele n den sieni kaa ba tinmu.
->>>>>>> da8c708a841256640d2d47121b4a92acf46b3b55
+\c 18 \v 1 Isalele yaaba n den paadi mi diema, bi kuli den taani Silo dogu nni ki caani li kani u kadikaanu gbandieli. \v 2 Bi siiga buoli lele n den sieni kaa ba tinmu.
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index b0edb0e..dc55372 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,17 +1,10 @@
 {
-	"project": {
-		"id": "jos",
-		"name": ""
-	},
-	"type": {
-		"id": "text",
-		"name": "Text"
-	},
+	"package_version": 7,
+	"format": "usfm",
 	"generator": {
 		"name": "ts-desktop",
 		"build": "27"
 	},
-	"package_version": 7,
 	"target_language": {
 		"name": "Gourmanchéma",
 		"direction": "ltr",
@@ -20,24 +13,32 @@
 		"is_gateway_language": false,
 		"id": "gux"
 	},
-	"format": "usfm",
+	"project": {
+		"id": "jos",
+		"name": "Joshua"
+	},
+	"type": {
+		"id": "text",
+		"name": "Text"
+	},
 	"resource": {
 		"id": "reg"
 	},
-	"translators": [
-		"Wilson",
-		"Gourmantchema",
-		"Door43"
-	],
 	"source_translations": [
 		{
 			"language_id": "en",
 			"resource_id": "ulb",
 			"checking_level": "3",
-			"date_modified": 20170329,
-			"version": "9"
+			"date_modified": "2021-10-27T14:25:59.0473154+00:00",
+			"version": "21-05"
 		}
 	],
+	"translators": [
+		"Wilson",
+		"Gourmantchema",
+		"Door43",
+		"ATCHAMADO_BEN"
+	],
 	"finished_chunks": [
 		"front-title",
 		"05-title",