diff --git a/01/01.txt b/01/01.txt
index a2f026f..73b77b0 100644
--- a/01/01.txt
+++ b/01/01.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 1 Nnaaru tuana hama ngiau mmataivoo vau suavaki, Anutuuqo ngiau mmatai vaatama mmuakiaa mminai yauvai immakeravai. \v 2 Haama voo mminnaa vovootaudu, heenaa pinaivoo mmuakia mmatai Vaa rummuaa apukioo vairavai. Vauduu nnoorivoo ivaa aakiaivaki vairavai.
-=======
-\v 1 Kioo Anutuuqo nuruanna tunoo, faii immaapuyaa mmataharaa sidinaidiyaa mmuakia mmata arau suruaakuaravairee tirarai. \v 2 Faii mmukia rasingiammaa hataumakii rarianai koyiaa rariayaa faii ngiiyara atukiararai. Ii yauraa Anutuqonoo ngimmiyaurai.
->>>>>>> 01074aa44822bf506c5c069416e66eb40547e96b
+\c 1 \v 1 Nnaaru tuana hama ngiau mmataivoo vau suavaki, Anutuuqo ngiau mmatai vaatama mmuakiaa mminai yauvai immakeravai. \v 2 Haama voo mminnaa vovootaudu, heenaa pinaivoo mmuakia mmatai Vaa rummuaa apukioo vairavai. Vauduu nnoorivoo ivaa aakiaivaki vairavai.
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 41afd0e..e5f0216 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,17 +1,10 @@
 {
-	"project": {
-		"id": "gen",
-		"name": ""
-	},
-	"type": {
-		"id": "text",
-		"name": "Text"
-	},
+	"package_version": 7,
+	"format": "usfm",
 	"generator": {
 		"name": "ts-desktop",
 		"build": "132"
 	},
-	"package_version": 7,
 	"target_language": {
 		"name": "Waffa",
 		"direction": "ltr",
@@ -20,25 +13,34 @@
 		"is_gateway_language": false,
 		"id": "waj"
 	},
-	"format": "usfm",
+	"project": {
+		"id": "gen",
+		"name": "Genesis"
+	},
+	"type": {
+		"id": "text",
+		"name": "Text"
+	},
 	"resource": {
 		"id": "reg"
 	},
-	"translators": [
-		"waffa 1",
-		"waffa 2"
-	],
 	"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": [
+		"waffa 1",
+		"waffa 2",
+		"PJenkins"
+	],
 	"finished_chunks": [
 		"01-title",
+		"01-01",
 		"01-03",
 		"01-06",
 		"01-09",
@@ -52,11 +54,11 @@
 		"01-28",
 		"01-30",
 		"02-title",
+		"02-01",
 		"02-04",
 		"02-07",
-		"02-11",
-		"02-01",
 		"02-09",
+		"02-11",
 		"02-13",
 		"02-15",
 		"02-18",
@@ -80,12 +82,13 @@
 		"04-10",
 		"04-13",
 		"04-16",
+		"04-18",
 		"04-20",
 		"04-23",
-		"04-18",
 		"04-25",
 		"05-title",
 		"05-01",
+		"05-03",
 		"05-06",
 		"05-09",
 		"05-12",
@@ -106,10 +109,9 @@
 		"06-13",
 		"06-16",
 		"06-18",
-		"07-title",
 		"06-20",
+		"07-title",
 		"08-title",
-		"05-03",
 		"09-title",
 		"09-01",
 		"09-03",
@@ -161,13 +163,16 @@
 		"12-10",
 		"12-14",
 		"12-17",
+		"13-title",
 		"13-01",
 		"13-03",
 		"13-05",
 		"13-08",
-		"13-12",
-		"13-16",
 		"13-10",
+		"13-12",
+		"13-14",
+		"13-16",
+		"14-title",
 		"14-01",
 		"14-03",
 		"14-07",
@@ -176,8 +181,6 @@
 		"14-15",
 		"14-17",
 		"14-19",
-		"13-title",
-		"14-title",
 		"14-21",
 		"15-title",
 		"15-01",
@@ -187,7 +190,6 @@
 		"15-12",
 		"15-14",
 		"15-17",
-		"13-14",
 		"16-title",
 		"16-01"
 	]