diff --git a/27/10.txt b/27/10.txt
index fcd3b0f5..95555603 100644
--- a/27/10.txt
+++ b/27/10.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 10 Jliapia jliaji yaacajle caidajpii coyoojledajlicaotsan, jliwacaketsa jliaji pamacaruda caipji namacaacaji ljiaji jiipai mamiinaridajlin.  niintsa naiñaaca napji vaca tsunipee, niintsa nausruacawa niite naiñacaa jlikii. \v 11 Metawerucuatsa napji jlikii, tuuconcaotsana. Nanuatsa napji inaiteepe namaitacaroona, cutsaa narso napji naiki maniicapen. ninwatsa curim keena jlicapa narso jliaji naminajli, jliawatsa jliaji jinaitacadana curimtsaca kenaa jlicapa narso.
-=======
-\v 10Jliapia jliaji yaacajle caidajpii coyoojledajlicaotsan, jliwacaketsa jliaji pamacaruda caipji namacaacaji ljiaji jiipai mamiinaridajlin.  niintsa naiñaaca napji vaca tsunipee, niintsa nausruacawa niite naiñacaa jlikii. \v 11Metawerucuatsa napji jlikii, tuuconcaotsana. Nanuatsa napji inaiteepe namaitacaroona, cutsaa narso napji naiki maniicapen. ninwatsa curim keena jlicapa narso jliaji naminajli, jliawatsa jliaji jinaitacadana curimtsaca kenaa jlicapa narso. 
->>>>>>> 93bc3d20cd2a50d326130466ccb2cc15c4390750
+\v 10 Jliapia jliaji yaacajle caidajpii coyoojledajlicaotsan, jliwacaketsa jliaji pamacaruda caipji namacaacaji ljiaji jiipai mamiinaridajlin.  niintsa naiñaaca napji vaca tsunipee, niintsa nausruacawa niite naiñacaa jlikii. \v 11 Metawerucuatsa napji jlikii, tuuconcaotsana. Nanuatsa napji inaiteepe namaitacaroona, cutsaa narso napji naiki maniicapen. ninwatsa curim keena jlicapa narso jliaji naminajli, jliawatsa jliaji jinaitacadana curimtsaca kenaa jlicapa narso.
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 0b104473..af764b79 100644
--- a/manifest.json
+++ b/manifest.json
@@ -221,6 +221,7 @@
 		"27-06",
 		"27-07",
 		"27-09",
+		"27-10",
 		"27-12",
 		"30-title",
 		"30-01",