diff --git a/14/01.txt b/14/01.txt
index 23d9680..97af867 100644
--- a/14/01.txt
+++ b/14/01.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\c 14 \v 1 Lobo sabit bito kololo Yesu daha kaji lo lobo Parisini hitok, orumu iririati inyi bebe. \v 2 Ija ketemoni nenge orumu ongon tungani na lomwai mwai lo ulan. \v 3 Itifi Yesu Parisihin ko ka genyak iyo cik ojo, “Iruk cik kitifurio to sabit kode ida?''
-=======
-\c 14 \v 1 Lobo sabit bito kololo Yesu daha kaji lo lobo Parisini hitok, orumu iririati inyi bebe. \v 2 Ija ketemoni nenge orumu ongon tungani na lomwai mwai lo ulan. \v 3 Itifi Yesu Parisihin ko ka genyak iyo cik ojo, “Iruk cik kitifurio to sabit kode ida?
->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037
+\c 14 \v 1 Lobo sabit bito kololo Yesu daha kaji lo lobo Parisini hitok, orumu iririati inyi bebe. \v 2 Ija ketemoni nenge orumu ongon tungani na lomwai mwai lo ulan. \v 3 Itifi Yesu Parisihin ko ka genyak iyo cik ojo, “Iruk cik kitifurio to sabit kode ida?''
\ No newline at end of file