diff --git a/01/01.txt b/01/01.txt
index 27bf4c89..9b0fbdce 100644
--- a/01/01.txt
+++ b/01/01.txt
@@ -1,17 +1 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-YESUS DI NGANGKAT KASARUGO YANJIOT NGATANGANO ROH KUDUS  \v 1    Ka doop buku lukas nang aku nulis sanap'e,  Teofilus,  ngisohot manyak sidi nang Yesus ngamuat mao pun nang io ngarajo'ot.  \v 2 sanape Io tarangkat, Io nyuruh Roh Kudus nga'lewati rasul- rasul nang Io milih. \v 3 ka ne'ido, Io ugo magari'ot Diri'E idup dah ako' singsaro, nang manyak bukti, sambil magari'ot diri'e kane'ido sampe ampat puluh ari nang ugo bacarito ngana'i kerajaan ALLAH.
-=======
-\v 1 \v 2 \v 3 yesus di ngangkat kasarugo nang janji atoknge rohkudus.
->>>>>>> 1471faffbd2bbf1db717e6b2b91175b9203b94b6
-=======
-saulus binasoot jemaat ka  Yerusalem.                                          Ako ko saulus satuju munuho Stepanus ko.                                       \v 1 Waktu ko,ado panganiayaan ka urok jemaat ka Yerusalem, lalu tapisoh ka tampat-tmpat Yudea ba Samaria,kacuali Para Rasul. \v 2 Sangape urok Saleh nyburo Stepanus,rami urok nang nanggisi io.                                          \v 3 Tapi bo Saulus barusoho mao binasoot jemaat,lalu taamok ka rumoh-rumoh,lo narikati angaki ba ambini lalu io nyarohot kadangan ka pinjaro.
->>>>>>> 64d1861a86104caab7546297c5da057da8d9958c
-=======
-\v 2 lalu imam\v 3  kayo bakato, batol\v 1  ge jaiyo?  Stefanus bakato, Kamaru-kamaru ba bapok-bapok, dangarot aku,Allah nang Mahamulia gari ka nenek moyang diri, Abraham, waktu io masih diop ka Mesopotamia, sanape io diop ka Haran, lalu bakatoka io, dari kau ampat kasio, tingoot kamaru-kamarungu, atok ka tanoh nang ku nojokot ka kau. Lalu Abraham ningoot tanoh kasdim diop ka Haran. Ampat kanaun ako bapoe mati,Allah nyuruh io pindoh ka tanoh nyian, tampat kau kanio diop. Tapi Allah ano mare io warisan, satapak tanohpun ano , malah bajanji mareo Abraham ba katurunane, padahal Abraham nape baranak.
->>>>>>> 5e6767e7f603863fdf3eed554703aeaa254ca2ef
-=======
-\v 1 Yesus dingagkat \v 2 ka'sarugo \v 3 bajanjie
->>>>>>> bcfc0ad1fb1f931816db4da59dde36ec7434c245
+\c 1 YESUS DI NGANGKAT KASARUGO YANJIOT NGATANGANO ROH KUDUS  \v 1    Ka doop buku lukas nang aku nulis sanap'e,  Teofilus,  ngisohot manyak sidi nang Yesus ngamuat mao pun nang io ngarajo'ot.  \v 2 sanape Io tarangkat, Io nyuruh Roh Kudus nga'lewati rasul- rasul nang Io milih. \v 3 ka ne'ido, Io ugo magari'ot Diri'E idup dah ako' singsaro, nang manyak bukti, sambil magari'ot diri'e kane'ido sampe ampat puluh ari nang ugo bacarito ngana'i kerajaan ALLAH.
\ No newline at end of file
diff --git a/01/title.txt b/01/title.txt
index 7f7189dd..9d90cd9f 100644
--- a/01/title.txt
+++ b/01/title.txt
@@ -1,13 +1 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-para rasul
-=======
-Pasal 1
->>>>>>> 64d1861a86104caab7546297c5da057da8d9958c
-=======
-pasal 1
->>>>>>> 5e6767e7f603863fdf3eed554703aeaa254ca2ef
-=======
-Pasal 1
->>>>>>> bcfc0ad1fb1f931816db4da59dde36ec7434c245
+Pasal 1
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 953a03ca..6b440105 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,17 +1,10 @@
 {
-	"project": {
-		"id": "act",
-		"name": ""
-	},
-	"type": {
-		"id": "text",
-		"name": "Text"
-	},
+	"package_version": 7,
+	"format": "usfm",
 	"generator": {
 		"name": "ts-desktop",
 		"build": "132"
 	},
-	"package_version": 7,
 	"target_language": {
 		"name": "Dayak Salako",
 		"direction": "ltr",
@@ -20,10 +13,26 @@
 		"is_gateway_language": false,
 		"id": "iba-x-salako"
 	},
-	"format": "usfm",
+	"project": {
+		"id": "act",
+		"name": "Acts"
+	},
+	"type": {
+		"id": "text",
+		"name": "Text"
+	},
 	"resource": {
 		"id": "reg"
 	},
+	"source_translations": [
+		{
+			"language_id": "id",
+			"resource_id": "ayt",
+			"checking_level": "3",
+			"date_modified": "2018-01-08T00:00:00+00:00",
+			"version": "2016"
+		}
+	],
 	"translators": [
 		"kristianus handani",
 		"Andrianus Jupri",
@@ -32,16 +41,8 @@
 		"Theresia",
 		"SUANDI",
 		"Enida",
-		"HERWAN"
-	],
-	"source_translations": [
-		{
-			"language_id": "id",
-			"resource_id": "ayt",
-			"checking_level": "3",
-			"date_modified": 20180207,
-			"version": "2016"
-		}
+		"HERWAN",
+		"Yohanes"
 	],
 	"finished_chunks": [
 		"02-32",