fix: merge conflicts

lib/game/pinball_game.dart

@@ -88,11 +88,6 @@ class PinballGame extends Forge2DGame
     );
   }
 
-  Future<void> _addRamps() async {
-    unawaited(addFromBlueprint(SpaceshipRamp()));
-    unawaited(addFromBlueprint(LaunchRamp()));
-  }
-
   Future<void> spawnBall() async {
     // TODO(alestiago): Remove once this logic is moved to controller.
     var plunger = firstChild<Plunger>();

test/helpers/extensions.dart

@@ -6,9 +6,9 @@ import 'helpers.dart';
 class PinballGameTest extends PinballGame {
   PinballGameTest()
       : super(
+          audio: MockPinballAudio(),
           theme: const PinballTheme(
             characterTheme: DashTheme(),
-            audio: MockPinballAudio(),
           ),
         );
 }
@@ -16,9 +16,9 @@ class PinballGameTest extends PinballGame {
 class DebugPinballGameTest extends DebugPinballGame {
   DebugPinballGameTest()
       : super(
+          audio: MockPinballAudio(),
           theme: const PinballTheme(
             characterTheme: DashTheme(),
-            audio: MockPinballAudio(),
           ),
         );
 }