diff --git a/07/04.txt b/07/04.txt
index 02d58df..0c1c17a 100644
--- a/07/04.txt
+++ b/07/04.txt
@@ -1 +1,5 @@
-\v 4 Orona netti, Oledadi-oledadigu, yemmi kaina bi mate tagu Hukum Taurat lewata tou karittu ga'ika yemmi jadi milik a  wede, niado Nia ne papakededa wali matedana niaka ghitto ta kolege ghuwa tagu Mori. \v 5 neghe ghitto bata moripapo barra kana'a, hawa nafsu dirraka ne paransangda oro Hukum Taurat paghilli barra anggota-anggota touda ghitto tagu kolena ghuwa tagu maut.
\ No newline at end of file
+<<<<<<< HEAD
+\v 4 Orona netti, Oledadi-oledadigu, yemmi kaina bi mate tagu Hukum Taurat lewata tou karittu ga'ika yemmi jadi milik a  wede, niado Nia ne papakededa wali matedana niaka ghitto ta kolege ghuwa tagu Mori. \v 5 neghe ghitto bata moripapo barra kana'a, hawa nafsu dirraka ne paransangda oro Hukum Taurat paghilli barra anggota-anggota touda ghitto tagu kolena ghuwa tagu maut.
+=======
+\v 4 Orona netti, Oledadi-oledadigu, yemmi kaina bi mate tagu Hukum Taurat lewata tou karittu ga'ika yemmi jadi milik a  wede, niado Nia ne papakededa wali matedana niaka ghitto ta kolege ghuwa tagu Mori. \v Niawe, neghe ghitto bata moripapo barra kana'a, hawa nafsu dirraka ne paransangda oro Hukum Taurat paghilli barra anggota-anggota touda ghitto tagu kolena ghuwa tagu maut.
+>>>>>>> 074eee92a285ae6c24a8194057b889b003b3b240
diff --git a/07/15.txt b/07/15.txt
index af83445..630ae53 100644
--- a/07/15.txt
+++ b/07/15.txt
@@ -1 +1,5 @@
-\v 15 Niawe, zauwa daku mangertikige  appawe neghe parawigu orona zauwa dakku rawikige hal neghe pabeigu, melainkan zauwa ku rawige ne hal pabuttugu ate. \v 16 Takka nia, niaka zauwa ku rawige suatu hal ne dappa bei rawigu, zauwa kusetujuwe  bawa Hukum Taurat netti naduawe.
\ No newline at end of file
+<<<<<<< HEAD
+\v 15 Niawe, zauwa daku mangertikige  appawe neghe parawigu orona zauwa dakku rawikige hal neghe pabeigu, melainkan zauwa ku rawige ne hal pabuttugu ate. \v 16 Takka nia, niaka zauwa ku rawige suatu hal ne dappa bei rawigu, zauwa kusetujuwe  bawa Hukum Taurat netti naduawe.
+=======
+\v Niawe, zauwa daku mangertikige  appawe neghe parawigu orona zauwa dakku rawikige hal neghe pabeigu, melainkan zauwa ku rawige ne hal pabuttugu ate. \v 16 Takka nia, niaka zauwa ku rawige suatu hal ne dappa bei rawigu, zauwa kusetujuwe  bawa Hukum Taurat netti naduawe.
+>>>>>>> 074eee92a285ae6c24a8194057b889b003b3b240
diff --git a/manifest.json b/manifest.json
index 8a5f971..bf42bdd 100644
--- a/manifest.json
+++ b/manifest.json
@@ -120,13 +120,11 @@
 		"07-title",
 		"07-01",
 		"07-02",
-		"07-04",
 		"07-06",
 		"07-07",
 		"07-09",
 		"07-11",
 		"07-13",
-		"07-15",
 		"07-17",
 		"07-19",
 		"07-22",