diff --git a/26/54.txt b/26/54.txt
index c5b14da..b781415 100644
--- a/26/54.txt
+++ b/26/54.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 54 Ku  ikowa ikulu mufwile ukupela icikwatwa icikulu, kabili ku mikowa inono mufwile ukuipela icikwatwa icinono. Kulupwa lonse mufwile ukupela icikwatwa ukulingana ne mpendwa ya baume abapendelwe. \v 55 Icifye, icalo cikakanishiwile mu kupendula. bafwile ukupya icalo ukulingana nefyo cikakanishiwa pakati ka mitundu ya fikolwe fyabo. \v 56 Ifikwatwa fyabo fifilwe ukwakanishiwa pakati ka mikowa iykulu ne mikowa iyinono, ukupelwa kuli bo mukupendulwa.
-=======
-\v 54 Kumikowa iikulu mufwile ukupela ifyakupyana ifingi, elo kumikowa iinono ifyakupyana ifinono. Cila lupwa mufwile ukupela icakupayana ukulingana nempendwa yabaume abapendelwe. \v 55 Nangula cibe ifyo, impanga mufwile ukwabanwa ukupitila mukupendula ukuipekanwa. Bafwile ukupyana icalo ngefyo cikabanishiwa ukulingana nefikolwe fyamikowa yabo. \v 56 Ifyakupyana fyabo fifwile ukwabanishiwa pakati kamikowa iikulu elo nemikowa iinono, ukupela kulibo ukupitila mukupendula.''
->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0
+\v 54 Kumikowa iikulu mufwile ukupela ifyakupyana ifingi, elo kumikowa iinono ifyakupyana ifinono. Cila lupwa mufwile ukupela icakupayana ukulingana nempendwa yabaume abapendelwe. \v 55 Nangula cibe ifyo, impanga mufwile ukwabanwa ukupitila mukupendula ukuipekanwa. Bafwile ukupyana icalo ngefyo cikabanishiwa ukulingana nefikolwe fyamikowa yabo. \v 56 Ifyakupyana fyabo fifwile ukwabanishiwa pakati kamikowa iikulu elo nemikowa iinono, ukupela kulibo ukupitila mukupendula.''
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 0484f8e..7e2b9de 100644
--- a/manifest.json
+++ b/manifest.json
@@ -325,6 +325,7 @@
 		"23-28",
 		"24-title",
 		"26-title",
+		"26-54",
 		"26-57",
 		"26-60",
 		"26-63",