fix: merge conflicts

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);

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);