diff --git a/03/12.txt b/03/12.txt
index de22000..d26add1 100644
--- a/03/12.txt
+++ b/03/12.txt
@@ -1 +1 @@
-\v 13 \v 12 Pi ne jala, a bile mii rile niwasa ka echi rite lanami jitra, rite ratabami, rite bayoami, tabli, lol sayala  13 Echi nochala mi ruwirtami nima re, echi rawewali mi ruwirtami nima. ayena cho  echona nairli ayenacho mi ruirma re. echi naii ko inema re karka bile nopi iiri olali.
\ No newline at end of file
+\v 12 Pi ne jala, a bile mii rile niwasa ka echi rite lanami jitra, rite ratabami, rite bayoami, tabli, lol sayala \v 13 Echi nochala mi ruwirtami nima re, echi rawewali mi ruwirtami nima. ayena cho  echona nairli ayenacho mi ruirma re. echi naii ko inema re karka bile nopi iiri olali.
\ No newline at end of file
diff --git a/04/01.txt b/04/01.txt
index f44feb7..ca05947 100644
--- a/04/01.txt
+++ b/04/01.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\c 4 \v 1 Echiriga nima echi bile rijoi echiriga neka olasati mapuriga nochami echi kristo yuga ali yarami karika echi bichiwali nasokatami echi Riosi yuga. \v 2 Jena napawika uchiwi, bile arami ju echi karika yarami echi nochami echi aboni echiriga ni'isa ni ala inerami.
-=======
-\v 1 Echiriga nima echi bile rijoi echiriga neka olasati mapuriga nochami echi kristo yuga ali yarami karika echi bichiwali nasokatami echi Riosi yuga. \v 2  Jena napawika uchiwi, bile tarami ju echi karika yarami echi nochami echi aboni echiriga ni'isa ni ala inerami.
->>>>>>> 1b12df19405d16fce10090c6b17ebc9352b356de
+\c 4 \v 1 Echiriga nima echi bile rijoi echiriga neka olasati mapuriga nochami echi kristo yuga ali yarami karika echi bichiwali nasokatami echi Riosi yuga. \v 2 Jena napawika uchiwi, bile arami ju echi karika yarami echi nochami echi aboni echiriga ni'isa ni ala inerami.
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index e4944fe..420af4e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -57,6 +57,7 @@
 		"03-03",
 		"03-06",
 		"03-08",
+		"03-10",
 		"03-12",
 		"03-14",
 		"03-16",