diff --git a/15/14.txt b/15/14.txt
index 7c12302..8a87dc5 100644
--- a/15/14.txt
+++ b/15/14.txt
@@ -1 +1 @@
-\v 14 Mine ngekwami ngenelisekile ngani, bomnaketfu. Ngenelisekile kutsi nine ngekwenu nigcwele kulunga, nigcwele lonkhe lwati. Nginelisekile kutsi niyakhona nekuyalana.
\ No newline at end of file
+\v 14 Mine ngekwami ngenetisekile ngani, bomnaketfu. Ngenetisekile kutsi nine ngekwenu nigcwele kulunga, nigcwele lonkhe lwati. Nginetisekile kutsi niyakhona nekuyalana.
\ No newline at end of file
diff --git a/15/15.txt b/15/15.txt
index 415e66f..ba31cbb 100644
--- a/15/15.txt
+++ b/15/15.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 15 Kodvwa ngibhala ngesibindzi kini kuze nginikhumbute futsi, ngenca yemusa lasiphe wona Nkulunkulu. \v 16 Lesipho kwaba kutsi ngibe sisebenti sa Kristu Jesu lesatfunyelwa kubeZizwe, kuze nginikele njenge Mphristi livangeli laNkulunkulu, kuze lomnikelo wabeZizwe ube ngulowemukelekako, lohlantwe nguMoya loyNgcwele.
-=======
-\v 15 Kepha ngibhala ngigcwalisekile kuwe ngaletinye tintfo  kute ngikukhumbute futsi, ngenca yemusa lengiwunikwe nguNkulunkulu. \v 16 lesipho lesi bekungukutsi ngibe sisebenti saKhristu Jesu lesitfunyelwe kubetive, kutsi tinikele njempristi livangeli leliphuma  kuNkulunkulu, kute kutsi lomnikelo webetive ungahle uvunywa, vungcwelisiwe ngaMoya Loyingcwele.
->>>>>>> 4fa5576582ded6581633cddc84969ad5666fca94
+\v 15 Kepha ngibhala ngigcwalisekile kuwe ngaletinye tintfo  kute ngikukhumbute futsi, ngenca yemusa lengiwunikwe nguNkulunkulu. \v 16 lesipho lesi bekungukutsi ngibe sisebenti saKhristu Jesu lesitfunyelwe kubetive, kutsi tinikele njempristi livangeli leliphuma  kuNkulunkulu, kute kutsi lomnikelo webetive ungahle uvunywa, vungcwelisiwe ngaMoya Loyingcwele.
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index f9c4317..21db85b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -228,6 +228,7 @@
 		"15-10",
 		"15-12",
 		"15-13",
+		"15-14",
 		"16-title"
 	]
 }
\ No newline at end of file