diff --git a/39/12.txt b/39/12.txt
index c3b2a2e..32fac03 100644
--- a/39/12.txt
+++ b/39/12.txt
@@ -1 +1,5 @@
-\v 12 Ohar tuju kenae badahomae Israel utuf hofnakr morgomakomai one tufke gaifomhakomain onake onetufhataeke todomakomain. \v 13 One aiyao ke bain rigav ene faran oke gama mahakomain ke, one sin one mos mae farakomain ke, onaigu fae no mutuv maidav ke ankomain No fae Myao Kodon,
\ No newline at end of file
+<<<<<<< HEAD
+\v 12 Ohar tuju kenae badahomae Israel utuf hofnakr morgomakomai one tufke gaifomhakomain onake onetufhataeke todomakomain. \v 13 One aiyao ke bain rigav ene faran oke gama mahakomain ke, one sin one mos mae farakomain ke, onaigu fae no mutuv maidav ke ankomain No fae Myao Kodon,
+=======
+\v 12 .... \v 13 One aiyao ke bain rigav ene faran oke gama mahakomain ke, one sin one mos mae farakomain ke, onaigu fae no mutuv maidav ke ankomain No fae Myao Kodon,
+>>>>>>> 75ce8a5d61c430f9ade8cfddb8c377ee3e58cff6
diff --git a/manifest.json b/manifest.json
index 6528a0f..b8f2b7c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -515,7 +515,6 @@
 		"39-07",
 		"39-09",
 		"39-11",
-		"39-12",
 		"39-14",
 		"39-17",
 		"39-19",