fix merge conflict bug

Author: julian-CStack

lib/pages/add_wallet_views/restore_wallet_view/restore_options_view/restore_options_view.dart

@@ -519,23 +519,22 @@ class _SeedRestoreOptionState extends ConsumerState<SeedRestoreOption> {
         if (isCnAnd25 ||
             widget.coin is Epiccash ||
             widget.coin is Mimblewimblecoin)
-          SizedBox(height: Util.isDesktop ? 16 : 8),
-        RoundedWhiteContainer(
-          child: Center(
-            child: Text(
-              ref.watch(_pIsUsingDate)
-                  ? "Choose the date you made the wallet (approximate is fine)"
-                  : "Enter the initial block height of the wallet",
-              style: Util.isDesktop
-                  ? STextStyles.desktopTextExtraSmall(context).copyWith(
-                      color: Theme.of(
-                        context,
-                      ).extension<StackColors>()!.textSubtitle1,
-                    )
-                  : STextStyles.smallMed12(context).copyWith(fontSize: 10),
+          RoundedWhiteContainer(
+            child: Center(
+              child: Text(
+                ref.watch(_pIsUsingDate)
+                    ? "Choose the date you made the wallet (approximate is fine)"
+                    : "Enter the initial block height of the wallet",
+                style: Util.isDesktop
+                    ? STextStyles.desktopTextExtraSmall(context).copyWith(
+                        color: Theme.of(
+                          context,
+                        ).extension<StackColors>()!.textSubtitle1,
+                      )
+                    : STextStyles.smallMed12(context).copyWith(fontSize: 10),
+              ),
             ),
           ),
-        ),
         if (isCnAnd25 ||
             widget.coin is Epiccash ||
             widget.coin is Mimblewimblecoin)