diff --git a/01/01.txt b/01/01.txt
index dfb5f34..28ae5d3 100644
--- a/01/01.txt
+++ b/01/01.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 1 Paoly, gadran'i Jesôsy Kristy,mban'ny Timoty rahalahy ho an'i Filemona, namana tenay sy ny mpiara-miasa aminay,\v 2  de ho an'i Apia anakavinay, de Arkipo miaramila akamanay koa, de ho an'ny mpivavaka zegny miangona adragnonao ao. \v 3 Enga anie de ho aminareo ny fahasoavana sy ny fiadanana avy amin'Andriamanitra Abantsena sy Jesôsy Kristy Tompo.
-=======
-\v 1 Pôly, vôgadra an'i Jesôsy Kristy, amban'ny ralahy Timoty ho an'i Filemôna, akama malalanay de mpiara-miasa aminay,\v 2  de ho an'i Apia anakavinay, sady Arkipo miaramila akamanay, de ho an'ny fiangonana zay mivory adragnonao.\v 3  Ho aminareo anie ny fahasoavana amban'ny fiadanana avy amin'Andriamanitra de Jesôsy Kristy Tompo.
->>>>>>> 2a8a98e7a68dc264d02cbf40b889ce1ab79df8f7
+\c 1 \v 1 Pôly, vôgadra an'i Jesôsy Kristy, amban'ny ralahy Timoty ho an'i Filemôna, akama malalanay de mpiara-miasa aminay, \v 2 de ho an'i Apia anakavinay, sady Arkipo miaramila akamanay, de ho an'ny fiangonana zay mivory adragnonao. \v 3 Ho aminareo anie ny fahasoavana amban'ny fiadanana avy amin'Andriamanitra de Jesôsy Kristy Tompo.
\ No newline at end of file
diff --git a/01/title.txt b/01/title.txt
index 81c2ada..86739ed 100644
--- a/01/title.txt
+++ b/01/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-FILEMONA toko 1
-=======
-Filemona Toko 1
->>>>>>> 2a8a98e7a68dc264d02cbf40b889ce1ab79df8f7
+Toko 1
\ No newline at end of file
diff --git a/front/title.txt b/front/title.txt
index 7234f68..afa8ba4 100644
--- a/front/title.txt
+++ b/front/title.txt
@@ -1 +1 @@
-FILEMONA
\ No newline at end of file
+Filemona
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 659ffbd..07bcfa3 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,17 +1,10 @@
 {
-	"project": {
-		"id": "phm",
-		"name": ""
-	},
-	"type": {
-		"id": "text",
-		"name": "Text"
-	},
+	"package_version": 7,
+	"format": "usfm",
 	"generator": {
 		"name": "ts-desktop",
 		"build": "3"
 	},
-	"package_version": 7,
 	"target_language": {
 		"name": "Antambahoaka",
 		"direction": "ltr",
@@ -20,25 +13,35 @@
 		"is_gateway_language": false,
 		"id": "-x-antambahoaka"
 	},
-	"format": "usfm",
+	"project": {
+		"id": "phm",
+		"name": "Philemon"
+	},
+	"type": {
+		"id": "text",
+		"name": "Text"
+	},
 	"resource": {
 		"id": "reg"
 	},
-	"translators": [
-		"PLT-MADA007",
-		"PLT-MAD006"
-	],
 	"source_translations": [
 		{
 			"language_id": "plt",
 			"resource_id": "ulb",
 			"checking_level": "3",
-			"date_modified": 20181101,
+			"date_modified": "2018-11-01T00:00:00+00:00",
 			"version": "7.1"
 		}
 	],
+	"translators": [
+		"PLT-MADA007",
+		"PLT-MAD006",
+		"Dell"
+	],
 	"finished_chunks": [
 		"front-title",
+		"01-title",
+		"01-01",
 		"01-04",
 		"01-08",
 		"01-10",