diff --git a/01/01.txt b/01/01.txt
index d941b95..dd5456b 100644
--- a/01/01.txt
+++ b/01/01.txt
@@ -1,6 +1 @@
-<<<<<<< HEAD
-\v 1 plonnda hara fenu Jemaat mana sia kota Tesalonika 
-\v 2 londa hara laok mia Paulus, silwanus
-=======
-\c 1 Londa hara soa neu ate ana mana tungga Lamatua sia Kambo Tesalonika \v 1 Londa hara mia Paulus, Silwanus, no Timotius, soa neu ate ana mana tungga Lamatua sia Tesalonika mana sia hita Ama Lamatua na rala, no Lamatua Yesus Kristus. \v 2 Bebei bara'ai no maua'manale lao mia Ama Lamatua no Lamatua Yesus Kristus soa neu nggo.
->>>>>>> 78aecccc11089700ab3bc52a590c064fe68a9f5c
+\c 1 Londa hara soa neu ate ana mana tungga Lamatua sia Kambo Tesalonika \v 1 Londa hara mia Paulus, Silwanus, no Timotius, soa neu ate ana mana tungga Lamatua sia Tesalonika mana sia hita Ama Lamatua na rala, no Lamatua Yesus Kristus. \v 2 Bebei bara'ai no maua'manale lao mia Ama Lamatua no Lamatua Yesus Kristus soa neu nggo.
\ No newline at end of file
diff --git a/front/title.txt b/front/title.txt
index c1cf2fa..979c39e 100644
--- a/front/title.txt
+++ b/front/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-TESALONIKA
-=======
-2 TESALONIKA
->>>>>>> 78aecccc11089700ab3bc52a590c064fe68a9f5c
+2 TESALONIKA
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 1c4e575..3d02e86 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,17 +1,10 @@
 {
-	"project": {
-		"id": "2th",
-		"name": ""
-	},
-	"type": {
-		"id": "text",
-		"name": "Text"
-	},
+	"package_version": 7,
+	"format": "usfm",
 	"generator": {
 		"name": "ts-desktop",
 		"build": "5"
 	},
-	"package_version": 7,
 	"target_language": {
 		"name": "Dela-Oenale",
 		"direction": "ltr",
@@ -20,26 +13,35 @@
 		"is_gateway_language": false,
 		"id": "row"
 	},
-	"format": "usfm",
+	"project": {
+		"id": "2th",
+		"name": "2 Thessalonians"
+	},
+	"type": {
+		"id": "text",
+		"name": "Text"
+	},
 	"resource": {
 		"id": "reg"
 	},
-	"translators": [
-		"Irma Rosmawati Dakabesy",
-		"Rote",
-		"bahasatech.indotengah"
-	],
 	"source_translations": [
 		{
 			"language_id": "id",
 			"resource_id": "ayt",
 			"checking_level": "3",
-			"date_modified": 20200624,
+			"date_modified": "2020-06-22T00:00:00+00:00",
 			"version": "1.3"
 		}
 	],
+	"translators": [
+		"Irma Rosmawati Dakabesy",
+		"Rote",
+		"bahasatech.indotengah"
+	],
 	"finished_chunks": [
+		"front-title",
 		"01-title",
+		"01-01",
 		"01-03",
 		"01-06",
 		"01-09",