diff --git a/scorch.asm b/scorch.asm
index a8e56ce..6d817f9 100644
--- a/scorch.asm
+++ b/scorch.asm
@@ -8,9 +8,7 @@
 .def target = 800 ;5200  ; or 800
 
 .macro build
-	dta d"1.14" ; number of this build (3 bytes)
-<<<<<<< HEAD
-=======
+	dta d"1.15" ; number of this build (3 bytes)
 .endm
 
 .macro RMTSong
@@ -18,7 +16,6 @@
       lda #:1
       jsr RMTSongSelect
 ;    .ENDIF
->>>>>>> 5200
 .endm
 
     icl 'definitions.asm'
diff --git a/scorch.xex b/scorch.xex
index 1f25853..8e5f0c7 100644
Binary files a/scorch.xex and b/scorch.xex differ