From b9d5d68904887bfc1154fa2a542cbb19c101ccee Mon Sep 17 00:00:00 2001
From: alestiago <dev@alestiago.com>
Date: Tue, 22 Mar 2022 13:17:27 +0000
Subject: [PATCH] fix: merge conflict

---
 lib/game/components/board.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/game/components/board.dart b/lib/game/components/board.dart
index 906821ff..9c34a263 100644
--- a/lib/game/components/board.dart
+++ b/lib/game/components/board.dart
@@ -143,7 +143,7 @@ class _BottomGroupSide extends Component {
     )..initialPosition = _position +
         Vector2(
           (Flipper.size.x) * direction,
-          Flipper.size.y + SlingShot.size.y,
+          Flipper.size.y + Kicker.size.y,
         );
 
     await addAll([flipper, baseboard, kicker]);