Fix merge conflicts

source/Main.hx

@@ -81,14 +81,9 @@ class Main extends Sprite
 		initialState = funkin.TitleState;
 		#end
 
-<<<<<<< HEAD
 		initHaxeUI();
 
 		addChild(new FlxGame(gameWidth, gameHeight, initialState, framerate, framerate, skipSplash, startFullscreen));
-=======
-		haxe.ui.Toolkit.init();
-		addChild(new FlxGame(gameWidth, gameHeight, initialState, zoom, framerate, framerate, skipSplash, startFullscreen));
->>>>>>> origin/note-redux
 
 		#if debug
 		fpsCounter = new FPS(10, 3, 0xFFFFFF);

source/funkin/InitState.hx

@@ -176,11 +176,8 @@ class InitState extends FlxTransitionableState
 		FlxG.switchState(new PicoFight());
 		#elseif ANIMDEBUG
 		FlxG.switchState(new funkin.ui.animDebugShit.DebugBoundingState());
-<<<<<<< HEAD
-=======
 		#elseif LATENCY
 		FlxG.switchState(new LatencyState());
->>>>>>> origin/note-redux
 		#elseif NETTEST
 		FlxG.switchState(new netTest.NetTest());
 		#else

source/funkin/audiovis/SpectogramSprite.hx

@@ -9,12 +9,9 @@ import flixel.system.FlxSound;
 import flixel.util.FlxColor;
 import funkin.audiovis.PolygonSpectogram.VISTYPE;
 import funkin.audiovis.VisShit.CurAudioInfo;
-<<<<<<< HEAD
-=======
 import funkin.audiovis.dsp.FFT;
 import haxe.Timer;
 import lime.system.ThreadPool;
->>>>>>> origin/note-redux
 import lime.utils.Int16Array;
 
 using Lambda;

source/funkin/play/character/BaseCharacter.hx

@@ -464,17 +464,11 @@ class BaseCharacter extends Bopper
 		if (event.note.mustPress && characterType == BF)
 		{
 			// If the note is from the same strumline, play the sing animation.
-<<<<<<< HEAD
 			this.playSingAnimation(event.note.data.dir, false);
-=======
-			this.playSingAnimation(event.note.data.dir, false, event.note.data.altNote);
-			holdTimer = 0;
->>>>>>> origin/note-redux
 		}
 		else if (!event.note.mustPress && characterType == DAD)
 		{
 			// If the note is from the same strumline, play the sing animation.
-<<<<<<< HEAD
 			this.playSingAnimation(event.note.data.dir, false);
 		}
 		else if (characterType == GF)
@@ -484,10 +478,6 @@ class BaseCharacter extends Bopper
 				trace('Playing GF combo animation: combo${event.comboCount}');
 				this.playAnimation('combo${event.comboCount}', true, true);
 			}
-=======
-			this.playSingAnimation(event.note.data.dir, false, event.note.data.altNote);
-			holdTimer = 0;
->>>>>>> origin/note-redux
 		}
 	}
 

source/module.xml

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 <?xml version="1.0" encoding="utf-8" ?>
-=======
-<?xml version="1.0" encoding="utf-8"?>
->>>>>>> origin/note-redux
 <module>
 	<!-- A module provides additional behavior and configuration for HaxeUI. -->
 	<components>
@@ -11,7 +7,6 @@
 			This needs to be done HERE and not via the `include` macro because `Toolkit.init()`
 			reads this to build the component registry.
 		-->
-<<<<<<< HEAD
 		<class package="haxe.ui.core" loadAll="true" />
 
 		<class package="haxe.ui.components" loadAll="true" />
@@ -23,10 +18,5 @@
 		
 		<!-- Custom components. -->
 		<class package="funkin.ui.haxeui.components" loadAll="true" />
-=======
-		<class package="haxe.ui.components" loadAll="true" />
-		<class package="haxe.ui.containers" loadAll="true" />
-		<class package="haxe.ui.core" loadAll="true" />
->>>>>>> origin/note-redux
 	</components>
 </module>