From 02df0907154282d344b236a2b7f959ff4e492d5e Mon Sep 17 00:00:00 2001
From: alestiago <dev@alestiago.com>
Date: Fri, 15 Apr 2022 09:14:15 +0100
Subject: [PATCH] fix: merge conflicts

---
 test/game/components/controlled_flipper_test.dart | 1 -
 test/game/components/controlled_plunger_test.dart | 1 -
 2 files changed, 2 deletions(-)

diff --git a/test/game/components/controlled_flipper_test.dart b/test/game/components/controlled_flipper_test.dart
index a005de30..c347736e 100644
--- a/test/game/components/controlled_flipper_test.dart
+++ b/test/game/components/controlled_flipper_test.dart
@@ -21,7 +21,6 @@ void main() {
         score: 0,
         balls: 0,
         bonusHistory: [],
-        activatedBonusLetters: [],
         activatedDashNests: {},
       );
       whenListen(bloc, Stream.value(state), initialState: state);
diff --git a/test/game/components/controlled_plunger_test.dart b/test/game/components/controlled_plunger_test.dart
index 8a722c9b..dddf407b 100644
--- a/test/game/components/controlled_plunger_test.dart
+++ b/test/game/components/controlled_plunger_test.dart
@@ -22,7 +22,6 @@ void main() {
         score: 0,
         balls: 0,
         bonusHistory: [],
-        activatedBonusLetters: [],
         activatedDashNests: {},
       );
       whenListen(bloc, Stream.value(state), initialState: state);