diff --git a/02/23.txt b/02/23.txt
index b120506f..a6b007e8 100644
--- a/02/23.txt
+++ b/02/23.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 23 Chu chaty lak chiskuwin takjtakgolh kasipijni chu lajchankgol Josué xkawasa Nun, chu tawanilh wej tuku kakgspulanilh. \v 24 Chu wanekgolh Josué xlikana kin Puchinakán kin kamaxkinitan amá tiyat. putun lakchixkuwín talamakgolh antá tapekuankgonit kin palakatakan.''
-=======
-\v 23 \v 24 Xchatuykan  lakchixkuwin taktakgolh nakj sipi chu talákgchilh  Josué xkawasa Nun, chu tawánilh wekj tuku kakgspulánilh.24  Chu wanikgolh Josué: xlikana kin PUCHINAKÁN kin kamaxkinitan amá tiyat. putún lakchixkuwín talamakgolh antá tapekuankgonit kin palakatakán.''
->>>>>>> bd987ff0f7185ee44537e2802eab40c8e5bb6f58
+\v 23 Xchatuykan  lakchixkuwin taktakgolh nakj sipi chu talákgchilh  Josué xkawasa Nun, chu tawánilh wekj tuku kakgspulánilh. \v 24 Chu wanikgolh Josué: xlikana kin PUCHINAKÁN kin kamaxkinitan amá tiyat. putún lakchixkuwín talamakgolh antá tapekuankgonit kin palakatakán.''
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index ba785ae3..518f9a64 100644
--- a/manifest.json
+++ b/manifest.json
@@ -74,6 +74,7 @@
 		"02-18",
 		"02-20",
 		"02-22",
+		"02-23",
 		"03-title",
 		"03-01",
 		"03-02",