diff --git a/source/funkin/modding/base/ScriptedMusicBeatSubState.hx b/source/funkin/modding/base/ScriptedMusicBeatSubState.hx
index 5090bf2b4..7dab3d7dd 100644
--- a/source/funkin/modding/base/ScriptedMusicBeatSubState.hx
+++ b/source/funkin/modding/base/ScriptedMusicBeatSubState.hx
@@ -1,16 +1,8 @@
 package funkin.modding.base;
 
 /**
-<<<<<<< HEAD
- * A script that can be tied to a MusicBeatSubstate.
- * Create a scripted class that extends MusicBeatSubstate to use this.
- */
-@:hscriptClass
-class ScriptedMusicBeatSubstate extends funkin.MusicBeatSubstate implements HScriptedClass {}
-=======
  * A script that can be tied to a MusicBeatSubState.
  * Create a scripted class that extends MusicBeatSubState to use this.
  */
 @:hscriptClass
 class ScriptedMusicBeatSubState extends funkin.MusicBeatSubState implements HScriptedClass {}
->>>>>>> f73c34bcbea4289202f6ef90522808b211d1cf44