fix: merge conflicts

test/game/components/alien_zone_test.dart

@@ -13,7 +13,7 @@ import '../../helpers/helpers.dart';
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
-  final flameTester = FlameTester(EmptyPinballGameTest.new);
+  final flameTester = FlameTester(EmptyPinballTestGame.new);
 
   group('AlienZone', () {
     flameTester.test(
@@ -52,7 +52,7 @@ void main() {
       });
 
       final flameBlocTester = FlameBlocTester<PinballGame, GameBloc>(
-        gameBuilder: EmptyPinballGameTest.new,
+        gameBuilder: EmptyPinballTestGame.new,
         blocBuilder: () => gameBloc,
       );
 

test/game/components/controlled_flipper_test.dart

@@ -13,8 +13,8 @@ void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
   final flameTester = FlameTester(EmptyPinballTestGame.new);
 
-  final gameOverBlocTester = FlameBlocTester<EmptyPinballGameTest, GameBloc>(
-    gameBuilder: EmptyPinballGameTest.new,
+  final gameOverBlocTester = FlameBlocTester<EmptyPinballTestGame, GameBloc>(
+    gameBuilder: EmptyPinballTestGame.new,
     blocBuilder: () {
       final bloc = MockGameBloc();
       const state = GameState(

test/game/components/controlled_plunger_test.dart

@@ -12,10 +12,10 @@ import '../../helpers/helpers.dart';
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
-  final flameTester = FlameTester(EmptyPinballGameTest.new);
+  final flameTester = FlameTester(EmptyPinballTestGame.new);
 
-  final gameOverBlocTester = FlameBlocTester<EmptyPinballGameTest, GameBloc>(
-    gameBuilder: EmptyPinballGameTest.new,
+  final gameOverBlocTester = FlameBlocTester<EmptyPinballTestGame, GameBloc>(
+    gameBuilder: EmptyPinballTestGame.new,
     blocBuilder: () {
       final bloc = MockGameBloc();
       const state = GameState(