diff --git a/src/pages/members/manage-members/ManageMembers.tsx b/src/pages/members/manage-members/ManageMembers.tsx
index 7ef563b..67f7341 100644
--- a/src/pages/members/manage-members/ManageMembers.tsx
+++ b/src/pages/members/manage-members/ManageMembers.tsx
@@ -116,30 +116,6 @@ const ManageMembers = () => {
   if (loading) return <ScreenLoader />;
 
   return (
-<<<<<<< Updated upstream
-    <div>
-      <div className="container mx-auto w-full">
-        <ConfirmDialog
-          open={dialogOpen}
-          onClose={() => setDialogOpen(false)}
-          title="Confirm Action"
-          content={`Are you sure you want to ${dialogType}?`}
-          onYes={handleYes}
-          onNo={() => setDialogOpen(false)}
-        />
-        <CustomerDialog
-          open={isDialogOpen}
-          handleClose={closeDialog}
-          handleSubmit={handleSubmit}
-          initialData={member}
-          fetchCustomers={fetchCustomers}
-        />
-        <h1 className="text-xl font-medium leading-none text-gray-900 mb-3">Manage Members</h1>
-        <Breadcrumbs>
-          <Link underline="none" color="inherit" href="/">
-            <span className="text-sm hover:underline">Dashboard</span>
-          </Link>
-=======
     <>
       <Helmet>
         <title>TPAY | Manage Members</title>
@@ -166,8 +142,6 @@ const ManageMembers = () => {
               <Link underline="none" color="inherit" href="/">
                 <span className="text-sm hover:underline">Dashboard</span>
               </Link>
->>>>>>> Stashed changes
-
               <Link underline="none" color="inherit">
                 <span className="text-sm">Members</span>
               </Link>