diff --git a/01/20.txt b/01/20.txt
index 4c24a8e..95d7c16 100644
--- a/01/20.txt
+++ b/01/20.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 20 "Kwenye kitabu cha Zaburi imeandikwa, 'Ngoja eneo lake liwe kama mahame na isiruhusiwe hata mmoja kuishi pale;' na, 'Ruhusu mtu mwingine achukue nafasi yake ya uongozi.'
-=======
-\v 20 "Kwenye kitabu cha Zaburi imeandikwa, 'Eneo lake liwe hame na isiruhusiwe hata mmoja kuishi pale;' na, 'Ruhusu mtu mwingine achukue nafasi yake ya uongozi.'
->>>>>>> 641795131ed10711930bea4f72ce83f81dc70d3c
+\v 20 "Kwenye kitabu cha Zaburi imeandikwa, 'Ngoja eneo lake lifanwe kuwa mahame na asiruhusiwe hata mmoja kuishi pale;' na, 'Ruhusu mtu mwingine achukue nafasi yake ya uongozi.'
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 588b99e..a8144a2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -44,6 +44,7 @@
 		"01-06",
 		"01-09",
 		"01-15",
+		"01-17",
 		"01-24",
 		"02-title",
 		"02-12",