diff --git a/06/17.txt b/06/17.txt
index f1486b6..70a1558 100644
--- a/06/17.txt
+++ b/06/17.txt
@@ -1 +1,5 @@
-\v 17 A ramik ndak birid ki duniya tuku akshi da sukta ada bai, akshi danpa aro idak birid wara go pirtik bai. Amman dampa  arokshi i adak Suku mi abariwa birid ki jirewa gada kimu karak. \v 18 A ramikshi da thlam bilan, da birdi i kun wana bilan, da thlaba ndak bari na gizhi getak. \v 19 Dari kasin akshi ki jirewa.
\ No newline at end of file
+<<<<<<< HEAD
+\v 17 A ramik ndak birid ki duniya tuku akshi da sukta ada bai, akshi danpa aro idak birid wara go pirtik bai. Amman dampa  arokshi i adak Suku mi abariwa birid ki jirewa gada kimu karak. \v 18 A ramikshi da thlam bilan, da birdi i kun wana bilan, da thlaba ndak bari na gizhi getak. \v 19 Dari kasin akshi ki jirewa.
+=======
+\v 17 A ramik ndak birid ki duniya tuku akshi da sukta ada bai, akshi danpa aro idak birid wara go pirtik bai. Amman dampa  arokshi i adak Suku mi abariwa birid ki jirewa gada kimu karak. \v 18 A ramikshi da thlam bilan, da birdi i kun wana bilan, da thlaba ndak bari na gizhi getak. \v 19 Dari kasin akshi ki jirewa .
+>>>>>>> 14efab31e38a162d4d9ecb09270b78f9d847c48e
diff --git a/06/20.txt b/06/20.txt
index 00bb526..55c88fb 100644
--- a/06/20.txt
+++ b/06/20.txt
@@ -1 +1,5 @@
-\v 20 Timoty, ankalchi na be mi nda barichi. Athlab pədəm dari rama thlabginu na be mi anna gamɗaya mi ndak papiya adoro ma zigaya. \v 21 Ndo jəgab ayayata sau amman har da gwapi nakshi da dəvo jiriwa. Har da thlaba na ci
\ No newline at end of file
+<<<<<<< HEAD
+\v 20 Timoty, ankalchi na be mi nda barichi. Athlab pədəm dari rama thlabginu na be mi anna gamɗaya mi ndak papiya adoro ma zigaya. \v 21 Ndo jəgab ayayata sau amman har da gwapi nakshi da dəvo jiriwa. Har da thlaba na ci
+=======
+\v 20 Timoti, ankalchi na be mi nda bariciu. Athlab pudum dari rama thibginu na be mi anna gamdaya mi ndak papiya adaro ma zigaya. \v 21 Ndo jigab ayayata sau amman har da gwapi nakshi da duvo jirewa. Her da thlaba na ci.
+>>>>>>> 14efab31e38a162d4d9ecb09270b78f9d847c48e
diff --git a/manifest.json b/manifest.json
index 1243ffd..6fb1fd5 100644
--- a/manifest.json
+++ b/manifest.json
@@ -91,7 +91,6 @@
 		"06-09",
 		"06-11",
 		"06-13",
-		"06-15",
-		"06-20"
+		"06-15"
 	]
 }
\ No newline at end of file