diff --git a/lib/game/view/pinball_game_page.dart b/lib/game/view/pinball_game_page.dart
index 623f85c0..0fa6a1ad 100644
--- a/lib/game/view/pinball_game_page.dart
+++ b/lib/game/view/pinball_game_page.dart
@@ -70,14 +70,10 @@ class _PinballGameViewState extends State<PinballGameView> {
           showDialog<void>(
             context: context,
             builder: (_) {
-<<<<<<< HEAD
               return GameOverDialog(
                 score: state.score,
                 theme: widget.theme.characterTheme,
               );
-=======
-              return GameOverDialog(theme: widget.theme.characterTheme);
->>>>>>> main
             },
           );
         }
diff --git a/lib/game/view/widgets/game_over_dialog.dart b/lib/game/view/widgets/game_over_dialog.dart
index bd160fc4..13980e6b 100644
--- a/lib/game/view/widgets/game_over_dialog.dart
+++ b/lib/game/view/widgets/game_over_dialog.dart
@@ -52,6 +52,8 @@ class _GameOverDialogViewState extends State<GameOverDialogView> {
 
   @override
   Widget build(BuildContext context) {
+    final l10n = context.l10n;
+
     return Dialog(
       child: SizedBox(
         width: 200,