From ad44848ba231b8ce5fd7b34befc8668605f09bfe Mon Sep 17 00:00:00 2001
From: alestiago <dev@alestiago.com>
Date: Thu, 24 Mar 2022 13:36:24 +0000
Subject: [PATCH] chore: resolved merge conflicts

---
 lib/game/components/components.dart     | 1 -
 lib/game/components/flutter_forest.dart | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/game/components/components.dart b/lib/game/components/components.dart
index 0bcf39d8..07b036f6 100644
--- a/lib/game/components/components.dart
+++ b/lib/game/components/components.dart
@@ -5,7 +5,6 @@ export 'board_side.dart';
 export 'bonus_word.dart';
 export 'flipper.dart';
 export 'flutter_forest.dart';
-export 'initial_position.dart';
 export 'jetpack_ramp.dart';
 export 'joint_anchor.dart';
 export 'kicker.dart';
diff --git a/lib/game/components/flutter_forest.dart b/lib/game/components/flutter_forest.dart
index 6095f3f2..af5c33ec 100644
--- a/lib/game/components/flutter_forest.dart
+++ b/lib/game/components/flutter_forest.dart
@@ -3,7 +3,9 @@
 import 'package:flame/components.dart';
 import 'package:flame_bloc/flame_bloc.dart';
 import 'package:flame_forge2d/flame_forge2d.dart';
+import 'package:pinball/flame/blueprint.dart';
 import 'package:pinball/game/game.dart';
+import 'package:pinball_components/pinball_components.dart';
 
 /// {@template flutter_forest}
 /// Area positioned at the top right of the [Board] where the [Ball]
@@ -33,7 +35,7 @@ class FlutterForest extends Component
   @override
   void onNewState(GameState state) {
     super.onNewState(state);
-    gameRef.add(Ball()..initialPosition = position);
+    gameRef.addFromBlueprint(BallBlueprint(position: position));
   }
 
   @override