diff --git a/02/06.txt b/02/06.txt
index 6f13a9a..fd8a574 100644
--- a/02/06.txt
+++ b/02/06.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 6 Meta m+k+mexi mete aya'akani hapa+ mete uyuxexeiya, kenem+'it+akai,tsepa ne kwareuyu'iyarit+a, M+ta Kaka+yari wakwa'wareukax+rie te+teri, m+k+mexi ne pa+ ne pa+ine m+ta mete aya'akani hapa+ meteyuhe'k+akai tixa+ me kwate'un+it+a ne hetsie. \v 7 Tsepa tita m+k+mexi mete'uyurienike kwaraya'axe ne hetsie mieme. Kaka+yari hema kwati'wewie yu'wa+kawame te+teri'tsie pa+ta hipame'tsie. Ta'aurie mawetse m+k+mexi mekaneyek+ne yuri mete'uta'erik+ Kaka+yari niukieya'tsie aku iyamexi me h+k+texi circuncisos, \v 8 iya Pedro hapa+ yuri tiuta'eri Kaka+yari'tsie meta isiere circuncisos. M+ta Kaka+yari tiuta'uxima Pedro'tsie n+arik+ meta ya'xeik+a me circuncisos'k+ wa'hepasta
-=======
-\v 6 Meta m+k+mexi mete aya'akani hapa+ mete uyuxexeiya, kenem+'it+akai,tsepa ne kwareuyu'iyarit+a, M+ta Kaka+yari wakwa'wareukax+rie te+teri, m+k+mexi ne pa+ ne pa+ine m+ta mete aya'akani hapa+ meteyuhe'k+akai tixa+ me kwate'un+it+a ne hetsie. Tsepa tita m+k+mexi mete'uyurienike kwaraya'axe ne hetsie mieme. Kaka+yari heima kwati'wewie yu'wa+kawame te+teri'watsie pa+ta yayu'pa+meme hipame'watsie. \v 7 Ta'aurie mawetse m+k+mexi mekaneyek+ne yuri mete'uta'erik+ Kaka+yari niukieya'tsie aku iyamexi me h+k+texi circuncisos, iya Pedro hapa+ yuri tiuta'eri Kaka+yari'tsie meta isiere circuncisos'tsixi. \v 8 M+ta Kaka+yari tiuta'uxima Pedro'tsie n+arik+ meta ya'xeik+a me circuncisos'k+ wa'hepasta meta ya'xeik+a ne hetsie m+ta gentiles wa'tsie.
->>>>>>> f258a48bc48379d63ec85dbf627247551bfeaa83
+\v 6 Meta m+k+mexi mete aya'akani hapa+ mete uyuxexeiya, kenem+'it+akai,tsepa ne kwareuyu'iyarit+a, M+ta Kaka+yari wakwa'wareukax+rie te+teri, m+k+mexi ne pa+ ne pa+ine m+ta mete aya'akani hapa+ meteyuhe'k+akai tixa+ me kwate'un+it+a ne hetsie. Tsepa tita m+k+mexi mete'uyurienike kwaraya'axe ne hetsie mieme. Kaka+yari heima kwati'wewie yu'wa+kawame te+teri'watsie pa+ta yayu'pa+meme hipame'watsie. \v 7 Ta'aurie mawetse m+k+mexi mekaneyek+ne yuri mete'uta'erik+ Kaka+yari niukieya'tsie aku iyamexi me h+k+texi circuncisos, iya Pedro hapa+ yuri tiuta'eri Kaka+yari'tsie meta isiere circuncisos'tsixi. \v 8 M+ta Kaka+yari tiuta'uxima Pedro'tsie n+arik+ meta ya'xeik+a me circuncisos'k+ wa'hepasta meta ya'xeik+a ne hetsie m+ta gentiles wa'tsie.
\ No newline at end of file
diff --git a/02/09.txt b/02/09.txt
index 943131b..309dafc 100644
--- a/02/09.txt
+++ b/02/09.txt
@@ -1 +1 @@
-\v 9 Kepauka Santiago,Cefas meta Juan, mete'aya'at+ me h+k+t+kai m+k+mexi teyupanie me mankuke, me peti'enax+ imikieri ketiu me yetuiriyeriekai, mama'tserietak+ me tatsiu'pit+ak+ ne Bernabé met+a . M+k+mexi pa+ mete'uyuri tame tem+yehuk+ gentiles wa'hets+a, m+ta iyamexi mehuk+ kenimexi circuncisión meme'xeiya wa'hets+a. \v 10 M+k+ xeik+a metatsi'aye'erist+a temaye'eriwanik+ pobre'tsixi wa'tsie, ya xeik+a ne m+k+ pinitsie ne pa+ reuyeh+akai ye nem+tiyurienikekai.
\ No newline at end of file
+\v 9 Kepauka Santiago, Cefas meta Juan, mete'aya'at+ me h+k+t+kai m+k+mexi teyupanie me mankuke, me peti'enax+ imikieri ketiu me yetuiriyeriekai, mama'tserietak+ me tatsiu'pit+ak+ ne Bernabé met+a . M+k+mexi pa+ mete'uyuri tame tem+yehuk+ gentiles wa'hets+a, m+ta iyamexi mehuk+ kenimexi circuncisión meme'xeiya wa'hets+a. \v 10 M+k+ xeik+a metatsi'aye'erist+a temaye'eriwanik+ pobre'tsixi wa'tsie, ya xeik+a ne m+k+ pinitsie ne pa+ reuyeh+akai ye nem+tiyurienikekai.
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index a5e7308..86942c3 100644
--- a/manifest.json
+++ b/manifest.json
@@ -54,6 +54,7 @@
 		"02-title",
 		"02-01",
 		"02-03",
+		"02-06",
 		"02-09",
 		"02-11",
 		"02-13",