diff --git a/24/01.txt b/24/01.txt
index ea1b3a1..31ad4a8 100644
--- a/24/01.txt
+++ b/24/01.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\c 24 \v 1 Ilyo Balaam amwene ukuti ca wamina Yaweh ukupala Isreali taile, nge shita shimbi, ukubomfya ifya kubukilako, lelo aloleshe kuntanshi ya ciswebebe.
-=======
-\c 24 \v 1 Uluntu Balamu abwene ukuti casekesha Yahweh ukupala Israeli, wena taile, ngafilya cali munshita shimbi, mukubomba ifyakubuka. Eico kanshi wena aloleshefye pa matololo.
->>>>>>> 022fe91ed12ea752eea6474e1ac6919c447e0bd0
+\c 24 \v 1 Ilyo Balaam amwene ukuti ca wamina Yaweh ukupala Isreali taile, nge shita shimbi, ukubomfya ifya kubukilako, lelo aloleshe kuntanshi ya ciswebebe.
\ No newline at end of file