diff --git a/12/09.txt b/12/09.txt
index 96d79695..3d3138d9 100644
--- a/12/09.txt
+++ b/12/09.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 9 hua xanapuxcun tamaknukolh xapuxcu  Jericó, puxcu xalak Hai huanti hui xpaxtun Betel, \v 10 puxcu xalak Jerusalén,  puxcu xalak Hebrón , \v 11 puxcu xalak  Jarmut ,  puxcu xalak Laquis , \v 12 puxcu  xalak Eglón,  puxku xalak  Gezer,
-=======
-\v 9 \v 10 \v 11 \v 12 wa xanapuxcun tamaknukolh xapuxcu  Jericó, puxcu xalak Hai huanti hui xpaxtun Betel, 10 puxcu xalak Jerusalén,  puxcu xalak Hebrón , 11 puxcu xalak  Jarmut ,  puxcu xalak Laquis , 12 puxcu  xalak Eglón,  puxku xalak  Gezer,
->>>>>>> 8e4e6f7d5b4457fd97bc0479d17e51aea182683c
+\v 9 wa xanapuxcun tamaknukolh xapuxcu  Jericó, puxcu xalak Hai huanti hui xpaxtun Betel, \v 10 puxcu xalak Jerusalén,  puxcu xalak Hebrón , \v 11 puxcu xalak  Jarmut ,  puxcu xalak Laquis , \v 12 puxcu  xalak Eglón,  puxku xalak  Gezer,
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 7c57b20c..9adbed7b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -146,6 +146,7 @@
 		"12-03",
 		"12-06",
 		"12-07",
+		"12-09",
 		"12-13",
 		"12-17",
 		"12-21",