diff --git a/60/01.txt b/60/01.txt
index d66bbf9..7df7b1a 100644
--- a/60/01.txt
+++ b/60/01.txt
@@ -1,6 +1 @@
-<<<<<<< HEAD
-\c 60 \v 1 Mwe Lesa, mwa tufumyapo, mwatobolola na malinga Yesu; mwalifululwa; tubwesheni na kabili.
-=======
-\c 60 Kuli mushika wa ntimbo; uwa ku shinshan Eduthi. Michtam Yakwa Dabidi, iya kusambilisha; ilyo alwile na Aramu Naharaimu kabili na Aramu Zobali, na Joab abwelele no kwipaya amakana ikumi na yabili abena Edo mumu mukonko wa mucele.
-\v 1 Mwe Lesa, mwa tufumyapo, mwatobolola na malinga Yesu; mwalifululwa; tubwesheni na kabili.
->>>>>>> fadbe12b0d666dbea6108ced54e9b754fd13d17b
+\c 60 Kuli mushika wa ntimbo; uwa ku shinshan Eduthi. Michtam Yakwa Dabidi, iya kusambilisha; ilyo alwile na Aramu Naharaimu kabili na Aramu Zobali, na Joab abwelele no kwipaya amakana ikumi na yabili abena Edo mumu mukonko wa mucele. \v 1 Mwe Lesa, mwa tufumyapo, mwatobolola na malinga Yesu; mwalifululwa; tubwesheni na kabili.
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 761fd45..aa56062 100644
--- a/manifest.json
+++ b/manifest.json
@@ -512,6 +512,7 @@
 		"59-14",
 		"59-16",
 		"60-title",
+		"60-01",
 		"60-02",
 		"60-04",
 		"60-06",