diff --git a/02/18.txt b/02/18.txt
index 1204ee8..f31ce47 100644
--- a/02/18.txt
+++ b/02/18.txt
@@ -1,7 +1 @@
-<<<<<<< HEAD
-Am Nomtoy Anti Kristus \v 18 Anagu, henenne yiyo didiyaka zaman akhir; mon el mere ehpah mengemu ronggoya bahwa anti Kristus neme el emin, bahwa henenne danga anti Kristus. Mere wejokka yicca pegheniki bahwa henenne didiyaka zaman akhir. \v 19 Diyo emmni el barada yicca, tapi diyo in walli omon el yicca. jika diyo bagian walli el yicca, diyo engdika breg eggeni yicca. Tapdimoko, diyo amdaldak yicca tanaka alhundawongo bahwa in walli omon el yicca.
-=======
-Am Nomtoy Anti Kristus 
-
-\V 18 Anagu, henenne yiyo didiyaka zaman akhir; mon el mere ehpah mengemu ronggoya bahwa anti Kristus neme el emin, bahwa henenne danga anti Kristus. Mere wejokka yicca pegheniki bahwa henenne didiyaka zaman akhir. \v 19 Diyo emmni el barada yicca, tapi diyo in walli omon el yicca. jika diyo bagian walli el yicca, diyo engdika breg eggeni yicca. Tapdimoko, diyo amdaldak yicca tanaka alhundawongo bahwa in walli omon el yicca.
->>>>>>> 8244ca780c22033525b39c34e1a53c4c0700c7be
+Am Nomtoy Anti Kristus \v 18 Anagu, henenne yiyo didiyaka zaman akhir; mon el mere ehpah mengemu ronggoya bahwa anti Kristus neme el emin, bahwa henenne danga anti Kristus. Mere wejokka yicca pegheniki bahwa henenne didiyaka zaman akhir. \v 19 Diyo emmni el barada yicca, tapi diyo in walli omon el yicca. jika diyo bagian walli el yicca, diyo engdika breg eggeni yicca. Tapdimoko, diyo amdaldak yicca tanaka alhundawongo bahwa in walli omon el yicca.
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 76e2763..31c80cf 100644
--- a/manifest.json
+++ b/manifest.json
@@ -52,6 +52,7 @@
 		"02-09",
 		"02-12",
 		"02-15",
+		"02-18",
 		"02-20",
 		"02-22",
 		"02-24",