Fix merge issues

source/funkin/play/PicoFight.hx

@@ -1,16 +1,10 @@
 package funkin.play;
 
-import flixel.FlxObject;
 import flixel.FlxSprite;
 import flixel.addons.effects.FlxTrail;
 import flixel.group.FlxGroup.FlxTypedGroup;
 import flixel.math.FlxMath;
 import flixel.util.FlxColor;
-<<<<<<< HEAD
-import flixel.util.FlxDirectionFlags;
-import funkin.Note.NoteData;
-=======
->>>>>>> origin/note-redux
 import funkin.audiovis.PolygonSpectogram;
 import funkin.noteStuff.NoteBasic.NoteData;
 

source/funkin/play/PlayState.hx

@@ -16,10 +16,6 @@ import flixel.ui.FlxBar;
 import flixel.util.FlxColor;
 import flixel.util.FlxSort;
 import flixel.util.FlxTimer;
-<<<<<<< HEAD
-import funkin.Note;
-=======
->>>>>>> origin/note-redux
 import funkin.Section.SwagSection;
 import funkin.SongLoad.SwagSong;
 import funkin.charting.ChartingState;

source/funkin/play/Strumline.hx

@@ -2,16 +2,11 @@ package funkin.play;
 
 import flixel.FlxSprite;
 import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup;
-<<<<<<< HEAD
-=======
 import flixel.math.FlxPoint;
->>>>>>> origin/note-redux
 import flixel.tweens.FlxEase;
-import flixel.tweens.FlxTween;
 import funkin.noteStuff.NoteBasic.NoteColor;
 import funkin.noteStuff.NoteBasic.NoteDir;
 import funkin.noteStuff.NoteBasic.NoteType;
-import funkin.ui.PreferencesMenu;
 import funkin.util.Constants;
 
 /**