fixup! refactor(core): improved Stellar transaction signing interface for a more streamlined user experience.

Author: ibz

core/src/trezor/ui/layouts/delizia/__init__.py

@@ -1143,10 +1143,7 @@ async def confirm_trade(
             )
         menu = Menu.root(menu_items, TR.send__cancel_sign)
 
-<<<<<<< HEAD
         await confirm_with_menu(trade_layout, menu, "confirm_trade")
-=======
-        await confirm_with_menu(main_layout, menu, "confirm_payment_request")
 
         for sell_amount, buy_amount, t_address, t_account, t_account_path in trades:
             await confirm_trade(
@@ -1179,7 +1176,6 @@ async def confirm_trade(
             TR.confirm_total__title_fee,
             "confirm_payment_request",
         )
->>>>>>> d79e5c62f1 (fixup! refactor(core): improved Stellar transaction signing interface for a more streamlined user experience.)
 
     async def confirm_ethereum_staking_tx(
         title: str,