diff --git a/index.html b/index.html
index 1adddc9..d1db816 100644
--- a/index.html
+++ b/index.html
@@ -367,56 +367,6 @@
             <div class="page__header">
                 <h1>Wallet</h1>
             </div>
-            <<<<<<< Updated upstream <div class="grid gap-1" style="width: min(24rem, 100%);">
-                <div class="grid gap-0-5">
-                    <h5>Balance</h5>
-                    <h1 class="h1" id="rupee_balance"></h1>
-                </div>
-                <div id="cashier_status" class="hide flex align-center">
-                    <svg class="icon margin-right-0-5" xmlns="http://www.w3.org/2000/svg" height="24px"
-                        viewBox="0 0 24 24" width="24px" fill="#000000">
-                        <path d="M1 21h22L12 2 1 21zm12-3h-2v-2h2v2zm0-4h-2v-4h2v4z" />
-                    </svg>
-                    <span>Cashier is currently offline. Please check back again after a while.</span>
-                </div>
-                <div class="flex user-element">
-                    <button class="wallet-action" onclick="showPopup('topup_wallet_popup')">
-                        <svg class="icon" xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24"
-                            width="24px" fill="#000000">
-                            <path d="M0 0h24v24H0z" fill="none" />
-                            <path
-                                d="M21 18v1c0 1.1-.9 2-2 2H5c-1.11 0-2-.9-2-2V5c0-1.1.89-2 2-2h14c1.1 0 2 .9 2 2v1h-9c-1.11 0-2 .9-2 2v8c0 1.1.89 2 2 2h9zm-9-2h10V8H12v8zm4-2.5c-.83 0-1.5-.67-1.5-1.5s.67-1.5 1.5-1.5 1.5.67 1.5 1.5-.67 1.5-1.5 1.5z" />
-                        </svg>
-                        Top-up wallet
-                    </button>
-                    <button class="wallet-action" onclick="showPopup('withdraw_wallet_popup')">
-                        <svg class="icon" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24"
-                            height="24px" viewBox="0 0 24 24" width="24px" fill="#000000">
-                            <g>
-                                <rect fill="none" height="24" width="24" />
-                            </g>
-                            <g>
-                                <g>
-                                    <rect height="7" width="3" x="4" y="10" />
-                                    <rect height="7" width="3" x="10.5" y="10" />
-                                    <rect height="3" width="20" x="2" y="19" />
-                                    <rect height="7" width="3" x="17" y="10" />
-                                    <polygon points="12,1 2,6 2,8 22,8 22,6" />
-                                </g>
-                            </g>
-                        </svg>
-                        Transfer to bank
-                    </button>
-                </div>
-    </div>
-    <div id="wallet_history_wrapper" class="grid gap-1-5">
-        =======
-        <div id="wallet_history_wrapper" class="grid gap-1-5 user-element">
-            >>>>>>> Stashed changes
-            <div class="hide grid gap-1">
-                <h4>Pending transactions</h4>
-                <ul id="pending_wallet_transactions" class="grid gap-0-5"></ul>
-            </div>
             <div id="wallet_history_wrapper" class="grid gap-1-5 user-element">
                 <div class="hide grid gap-1">
                     <h4>Pending transactions</h4>
@@ -430,7 +380,6 @@
                     </div>
                 </div>
             </div>
-        </div>
         </section>
         <div id="transaction" class="inner-page hide grid gap-2">
             <div class="grid gap-1 justify-start">