fix: rebase issues

lib/game/game_assets.dart

@@ -11,10 +11,6 @@ extension PinballGameAssetsX on PinballGame {
       images.load(components.Assets.images.flipper.left.keyName),
       images.load(components.Assets.images.flipper.right.keyName),
       images.load(Assets.images.components.background.path),
-      images.load(Assets.images.components.spaceship.androidTop.path),
-      images.load(Assets.images.components.spaceship.androidBottom.path),
-      images.load(Assets.images.components.spaceship.lower.path),
-      images.load(Assets.images.components.spaceship.upper.path),
     ]);
   }
 }

lib/game/pinball_game.dart

@@ -9,9 +9,8 @@ import 'package:flame_bloc/flame_bloc.dart';
 import 'package:flame_forge2d/flame_forge2d.dart';
 import 'package:pinball/game/game.dart';
 import 'package:pinball/gen/assets.gen.dart';
+import 'package:pinball_components/pinball_components.dart' hide Assets;
 import 'package:pinball_theme/pinball_theme.dart' hide Assets;
-import 'package:pinball_components/pinball_components.dart';
-import 'package:pinball_theme/pinball_theme.dart';
 
 class PinballGame extends Forge2DGame
     with FlameBloc, HasKeyboardHandlerComponents {

lib/gen/assets.gen.dart

@@ -17,23 +17,6 @@ class $AssetsImagesComponentsGen {
 
   AssetGenImage get background =>
       const AssetGenImage('assets/images/components/background.png');
-  $AssetsImagesComponentsSpaceshipGen get spaceship =>
-      const $AssetsImagesComponentsSpaceshipGen();
-}
-
-class $AssetsImagesComponentsSpaceshipGen {
-  const $AssetsImagesComponentsSpaceshipGen();
-
-  AssetGenImage get androidBottom => const AssetGenImage(
-      'assets/images/components/spaceship/android-bottom.png');
-  AssetGenImage get androidTop =>
-      const AssetGenImage('assets/images/components/spaceship/android-top.png');
-  AssetGenImage get lower =>
-      const AssetGenImage('assets/images/components/spaceship/lower.png');
-  AssetGenImage get saucer =>
-      const AssetGenImage('assets/images/components/spaceship/saucer.png');
-  AssetGenImage get upper =>
-      const AssetGenImage('assets/images/components/spaceship/upper.png');
 }
 
 class Assets {

packages/pinball_components/lib/gen/assets.gen.dart

@@ -3,36 +3,26 @@
 ///  FlutterGen
 /// *****************************************************
 
-// ignore_for_file: directives_ordering,unnecessary_import
-
 import 'package:flutter/widgets.dart';
 
 class $AssetsImagesGen {
   const $AssetsImagesGen();
 
-  /// File path: assets/images/ball.png
   AssetGenImage get ball => const AssetGenImage('assets/images/ball.png');
-<<<<<<< HEAD
-
   $AssetsImagesFlipperGen get flipper => const $AssetsImagesFlipperGen();
+  AssetGenImage get spaceshipBridge =>
+      const AssetGenImage('assets/images/spaceship_bridge.png');
+  AssetGenImage get spaceshipSaucer =>
+      const AssetGenImage('assets/images/spaceship_saucer.png');
 }
 
 class $AssetsImagesFlipperGen {
   const $AssetsImagesFlipperGen();
 
-  /// File path: assets/images/flipper/left.png
   AssetGenImage get left =>
       const AssetGenImage('assets/images/flipper/left.png');
-
-  /// File path: assets/images/flipper/right.png
   AssetGenImage get right =>
       const AssetGenImage('assets/images/flipper/right.png');
-=======
-  AssetGenImage get spaceshipBridge =>
-      const AssetGenImage('assets/images/spaceship_bridge.png');
-  AssetGenImage get spaceshipSaucer =>
-      const AssetGenImage('assets/images/spaceship_saucer.png');
->>>>>>> 990de50 (feat: applying assets to the spaceship)
 }
 
 class Assets {

pubspec.yaml

@@ -43,7 +43,6 @@ flutter:
 
   assets:
     - assets/images/components/
-    - assets/images/components/spaceship/
 
 flutter_gen:
   line_length: 80