fix: remove rebase leftovers

new-lamassu-admin/src/pages/Customers/CustomerProfile.js

@@ -262,30 +262,6 @@ const CustomerProfile = memo(() => {
             </div>
           )}
         </div>
-        <div className={classes.rightSidePanel}>
-          {isOverview && (
-            <div>
-              <Box
-                className={classes.customerDetails}
-                display="flex"
-                justifyContent="space-between">
-                <CustomerDetails
-                  customer={customerData}
-                  locale={locale}
-                  setShowCompliance={() => setShowCompliance(!showCompliance)}
-                />
-              </Box>
-              <div>
-                <TransactionsList
-                  customer={customerData}
-                  data={sortedTransactions}
-                  locale={locale}
-                  loading={loading}
-                />
-              </div>
-            </div>
-          )}
-        </div>
         <div className={classes.rightSidePanel}>
           {isOverview && (
             <div>

new-lamassu-admin/src/pages/Customers/components/EditableCard.js

@@ -123,12 +123,7 @@ const EditableCard = ({
     [classes.label1Rejected]: state === OVERRIDE_REJECTED,
     [classes.label1Accepted]: state === OVERRIDE_AUTHORIZED
   }
-<<<<<<< HEAD
 
-=======
-  const isNotAuthorized =
-    state === OVERRIDE_REJECTED || state === OVERRIDE_PENDING
->>>>>>> feat: add dynamic position to editable cards, reject/authorize buttons
   const authorized =
     state === OVERRIDE_PENDING
       ? { label: 'Pending', type: 'neutral' }