Fix some merge conflict issues

source/funkin/ui/freeplay/CapsuleOptionsMenu.hx

@@ -29,10 +29,6 @@ class CapsuleOptionsMenu extends FlxSpriteGroup
   var leftArrow:InstrumentalSelector;
   var rightArrow:InstrumentalSelector;
 
-  var leftArrow:InstrumentalSelector;
-
-  var rightArrow:InstrumentalSelector;
-
   public function new(parent:FreeplayState, x:Float = 0, y:Float = 0, instIds:Array<String>):Void
   {
     super(x, y);

source/funkin/ui/freeplay/FreeplayState.hx

@@ -2387,7 +2387,7 @@ class FreeplayState extends MusicBeatSubState
       capsule.selected = false;
       capsule.forceHighlight = index == curSelected + 1;
 
-      capsule.targetPos.y = capsule.intendedY(index - curSelectedFloat);
+      capsule.targetPos.y = capsule.intendedY(index - curSelected);
       capsule.targetPos.x = (270 + (60 * (Math.sin(index - curSelectedFloat)))) + (CUTOUT_WIDTH * SONGS_POS_MULTI);
     }