diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx
index ce31dcbbe..998b9c46d 100644
--- a/source/funkin/play/PlayState.hx
+++ b/source/funkin/play/PlayState.hx
@@ -832,10 +832,7 @@ class PlayState extends MusicBeatState implements IHook
 				// swagNote.data = songNotes;
 				swagNote.data.sustainLength = songNotes.sustainLength;
 				swagNote.data.altNote = songNotes.altNote;
-<<<<<<< HEAD
-=======
 
->>>>>>> origin/master
 				swagNote.scrollFactor.set(0, 0);
 
 				var susLength:Float = swagNote.data.sustainLength;