diff --git a/12/22.txt b/12/22.txt
index 4367bd5..5d809f7 100644
--- a/12/22.txt
+++ b/12/22.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 22 Boemong jwa se, le tsile kwa Thabeng ya Sione le motse wa Modimo yo o tshelang, Jerusalema wa selegodimo, le ko boipelong ba dikete tse some tsa baengele. \v 23 Le tsile phuthegong ya motsalwa pele, e e kwadisetsweng kwa legodimong. Le tsile kwa Modimong, moathodi wa botlhe, le ko meweng ya basiami botlhe ba ba siamisitsweng. \v 24 Le tsile kwa go Jeso, motshereganyi wa kgolagano e ntshwa, le kwa mading a a kgatshiwang a a buang dilo tse di molemo go gaisa madia a ga Abele.
-=======
-\v 22 Boemong jwa se, le tsile kwa Thabeng ya Sione le motse wa Modimo yo o tshelang, Jerusalema wa selegodimo, le kwa boipelong ba dikete tse some tsa baengele. \v 23 Le tsile phuthegong ya motsalwa pele, e e kwadisetsweng kwa legodimong. Le tsile kwa Modimong, moathodi wa botlhe, le ko meweng ya basiami botlhe ba ba siamisitsweng. \v 24 Le tsile kwa go Jeso, motshereganyi wa kgolagano e ntsha, le kwa mading a a kgatshiwang a a buang dilo tse di molemo go gaisa madi a ga Abele.
->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
+\v 22 Boemong jwa se, le tsile kwa Thabeng ya Sione le motse wa Modimo yo o tshelang, Jerusalema wa selegodimo, le kwa boipelong ba dikete tse some tsa baengele. \v 23 Le tsile phuthegong ya motsalwa pele, e e kwadisetsweng kwa legodimong. Le tsile kwa Modimong, moathodi wa botlhe, le ko meweng ya basiami botlhe ba ba siamisitsweng. \v 24 Le tsile kwa go Jeso, motshereganyi wa kgolagano e ntsha, le kwa mading a a kgatshiwang a a buang dilo tse di molemo go gaisa madi a ga Abele.
\ No newline at end of file
diff --git a/12/25.txt b/12/25.txt
index e4b6034..c654725 100644
--- a/12/25.txt
+++ b/12/25.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 25 Bonang gore ga le gane ene yo o buang. Gonne fa ba ne ba sa kgona go falola yo oneng a ba tlhagisa ba le mo lefatsheng, re ka kgona jang go falola yo o ba tlhagisang a le kwa legodimong. \v 26 Ka nako nngwe, lentswe la gagwe le ne la tshikhinya lefatshe. Mme jaanong o solofeditse a re, "Gape ke tla tshikhinya lefatshe, mme eseng le fatshe hela, le le magodimo.''
-=======
-\v 25 Bonang gore ga le gane ene yo o buang. Gonne fa ba ne ba sa kgona go falola yo o neng a ba tlhagisa ba le mo lefatsheng, re ka kgona jang go falola yo o  tlhagisang a le kwa legodimong. \v 26 Ka nako nngwe, lentswe la gagwe le ne la tshikhinya lefatshe. Mme jaanong o solofeditse a re, "Gape ke tla tshikhinya,  eseng lefatshe fela, mme le magodimo.''
->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
+\v 25 Bonang gore ga le gane ene yo o buang. Gonne fa ba ne ba sa kgona go falola yo o neng a ba tlhagisa ba le mo lefatsheng, re ka kgona jang go falola yo o  tlhagisang a le kwa legodimong. \v 26 Ka nako nngwe, lentswe la gagwe le ne la tshikhinya lefatshe. Mme jaanong o solofeditse a re, "Gape ke tla tshikhinya,  eseng lefatshe fela, mme le magodimo.''
\ No newline at end of file
diff --git a/12/27.txt b/12/27.txt
index 7440689..2b78564 100644
--- a/12/27.txt
+++ b/12/27.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 27 Mafoko a, "Gape gape," a raya go tlosiwa ga dilo tshotlhe tse di ka tshikhinyegang, mo go raya, mo dilong tsotlhe tse di tlhodilweng, gore dilo tsotlhe tse di ka seke tsa tshikhinyega tsone di tla sala. \v 28 Ka jalo, amogelang puso e e ka sekang ya tshikhinngwa, a re lebogeng, ka tsela e a re obameleng le go tlotla le go tsholetsa Modimo. \v 29 Gonne Modimo wa rona ke molelo o o nyeletsang.
-=======
-\v 27 Mafoko a, "Gape gape," a raya go tlosiwa ga dilo tsotlhe tse di ka tshikhinngwang, ke gore, mo dilong tsotlhe tse di tlhodilweng, gore dilo tsotlhe tse di ka seke tsa tshikhinngwa di sale. \v 28 Ka jalo, amogelang puso e e ka sekang ya tshikhinngwa, a re lebogeng, ka tsela e a re obameleng le go tlotla le go tsholetsa Modimo. \v 29 Gonne Modimo wa rona ke molelo o o nyeletsang.
->>>>>>> e42f024dfbe8016b32bf80f92b1357b10b1b56f4
+\v 27 Mafoko a, "Gape gape," a raya go tlosiwa ga dilo tsotlhe tse di ka tshikhinngwang, ke gore, mo dilong tsotlhe tse di tlhodilweng, gore dilo tsotlhe tse di ka seke tsa tshikhinngwa di sale. \v 28 Ka jalo, amogelang puso e e ka sekang ya tshikhinngwa, a re lebogeng, ka tsela e a re obameleng le go tlotla le go tsholetsa Modimo. \v 29 Gonne Modimo wa rona ke molelo o o nyeletsang.
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 3914bc4..5dff002 100644
--- a/manifest.json
+++ b/manifest.json
@@ -175,6 +175,9 @@
 		"12-12",
 		"12-14",
 		"12-18",
+		"12-22",
+		"12-25",
+		"12-27",
 		"13-title",
 		"13-05",
 		"13-07",