diff --git a/lib/features/MainScreens/Wallet/presentation/pages/withdrawal/confirmation.dart b/lib/features/MainScreens/Wallet/presentation/pages/withdrawal/confirmation.dart
index 987d021..d7d3775 100644
--- a/lib/features/MainScreens/Wallet/presentation/pages/withdrawal/confirmation.dart
+++ b/lib/features/MainScreens/Wallet/presentation/pages/withdrawal/confirmation.dart
@@ -14,7 +14,7 @@ class WithdrawalConfirmation extends StatefulWidget {
 }
 
 class _WithdrawalConfirmationState extends State<WithdrawalConfirmation> {
-  final List titles = [ 
+  final List titles = [
     AppText.paymentMethod,
     AppText.accountName,
     AppText.iban,
diff --git a/lib/features/changePassword/presentation/pages/change_password_layout.dart b/lib/features/changePassword/presentation/pages/change_password_layout.dart
index 353a282..2d38df4 100644
--- a/lib/features/changePassword/presentation/pages/change_password_layout.dart
+++ b/lib/features/changePassword/presentation/pages/change_password_layout.dart
@@ -8,8 +8,16 @@ class ChangePasswordLayout extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+<<<<<<< HEAD
     return const Scaffold(
         bottomNavigationBar: RestorePasswordBottomSection(),
         body: RestorePasswordForm());
+=======
+
+    return const Scaffold(
+        bottomNavigationBar: RestorePasswordBottomSection(),
+        body: RestorePasswordForm());
+
+>>>>>>> 0521b4ab76ca7b88a179487326f69cededd70e0b
   }
 }