diff --git a/05/06.txt b/05/06.txt
index e56e939d..c0ca62aa 100644
--- a/05/06.txt
+++ b/05/06.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 6 \v 7 Makhʉʉn meethar khʉʉn chaanta, ma Aayau ich jeb deeju atharr ar, magartha ausujim, mʉkhʉʉnta Josue me eu phʉrbichthar khʉʉnau, makhʉʉntha khʉd ee wetbamua me eu pod thʉbaatharkhʉʉn ajim.
-=======
-\v 6 Magta chi phobor Israel pien wenʉrrajierram desierto ee kuarentena ayos, magta thumwe chi khukhajem khʉʉn meekhajierram maach Ẽwandam iek ʉrhabathargaimua. Magta maach Ẽwandamua jaujim irua bʉrja chi jeb oopibam ajim anʉm, jooinag jeb deeju athar, mag jeb gai thʉnʉm leche miel, nempom khĩrphierragam deesim. \v 7
->>>>>>> be43bf24f316d0379b84c76be23c418aa8e63960
+\v 6 Magta chi phobor Israel pien wenʉrrajierram desierto ee kuarentena ayos, magta thumwe chi khukhajem khʉʉn meekhajierram maach Ẽwandam iek ʉrhabathargaimua. Magta maach Ẽwandamua jaujim irua bʉrja chi jeb oopibam ajim anʉm, jooinag jeb deeju athar, mag jeb gai thʉnʉm leche miel, nempom khĩrphierragam deesim. \v 7
\ No newline at end of file
diff --git a/front/title.txt b/front/title.txt
index af814090..01a4fdb5 100644
--- a/front/title.txt
+++ b/front/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Josué
-=======
-q
->>>>>>> 5e06395fb5849fbebe240cff0b8ef2b6723a3501
+Josué
\ No newline at end of file