diff --git a/39/42.txt b/39/42.txt
index 69167441..de4787dd 100644
--- a/39/42.txt
+++ b/39/42.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 42 Chuná ama lakchixkuwin xalak Israel tlawakgolh putum taskujut chuna la Puchiná xlimapekgsinit Moisés. \v 43 Moisés ukxilhi putum ama taskujut, chu, kaukxilhitit, xlakan xtatlawanit. chuná la Puchiná xlimapekgsinit, chuná xlakán tlawakgolh. alistalh Moisés kasikulnatlawa.
-=======
 \v 42 Chuná ama lakchixkuwin xalak Israel tlawakgolh putum taskujut chuna la Puchiná xlimapekgsinit Moisés. \v 43 Moisés ukxilhi putum ama taskujut, chu, kaukxilhtit, xlakan xtatlawanit. chuná la Puchiná xlimapekgsinit, chuná xlakán tlawakgolh. alistalh Moisés kasikulnatlawa.
->>>>>>> f99b3927bea3624650e369702b8fdcd9913aa734
diff --git a/manifest.json b/manifest.json
index 1a833bd1..b9963dcf 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
 	"format": "usfm",
 	"generator": {
 		"name": "ts-desktop",
-		"build": "238"
+		"build": "402"
 	},
 	"target_language": {
 		"id": "top",