diff --git a/29/06.txt b/29/06.txt
index 135594a..fe275dc 100644
--- a/29/06.txt
+++ b/29/06.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 6 Alenga impili sha ku Lebanoni ukutotela nge fiponti fya ngombe, no lupili lwa Sirioni nga kana ka mboo. \v 7 Ishiwi lyakwa Yawe lituma imyenge ya mulilo. \v 8 Ishiwi lyakwa Yawe lisunkanya lisunkanya amatololo ya kadshi.
-=======
-\v 6 \v 7 Ishiwi lyakwa Yawe lituma imyenge ya mulilo. \v 8 Ishiwi lyakwa Yawe lisunkanya lisunkanya amatololo ya kadshi.
->>>>>>> fadbe12b0d666dbea6108ced54e9b754fd13d17b
+\v 6 Alenga impili sha ku Lebanoni ukutotela nge fiponti fya ngombe, no lupili lwa Sirioni nga kana ka mboo. \v 7 Ishiwi lyakwa Yawe lituma imyenge ya mulilo. \v 8 Ishiwi lyakwa Yawe lisunkanya lisunkanya amatololo ya kadshi.
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index db5bd11..b6cbce1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -254,6 +254,7 @@
 		"29-title",
 		"29-01",
 		"29-03",
+		"29-06",
 		"29-09",
 		"29-11",
 		"30-title",