diff --git a/packages/web3/src/address/index.tsx b/packages/web3/src/address/index.tsx
index 40816395b..936e99f80 100644
--- a/packages/web3/src/address/index.tsx
+++ b/packages/web3/src/address/index.tsx
@@ -4,19 +4,12 @@ import { Space, Tooltip, message } from 'antd';
 import React from 'react';
 
 export interface AddressProps {
-<<<<<<< Updated upstream
-  ellipsis?: boolean | {
-    headClip?: number;
-    tailClip?: number;
-  };
-=======
   ellipsis?:
     | boolean
     | {
-        showHead?: number;
-        showTail?: number;
+        headClip?: number;
+        tailClip?: number;
       };
->>>>>>> Stashed changes
   address?: string;
   copyable?: boolean;
   tooltip?: boolean | TooltipProps['title'];
@@ -26,23 +19,13 @@ export const Address: React.FC<AddressProps> = (props) => {
   const { ellipsis, address, copyable, tooltip } = props;
 
   const isEllipsis = !!ellipsis;
-<<<<<<< Updated upstream
-  const {
-    headClip = 6,
-    tailClip = 4,
-  } = typeof ellipsis !== 'object' ? {
-    headClip: 6,
-    tailClip: 4,
-  } : ellipsis;
-=======
-  const { showHead = 6, showTail = 4 } =
+  const { headClip = 6, tailClip = 4 } =
     typeof ellipsis !== 'object'
       ? {
-          showHead: 6,
-          showTail: 4,
+          headClip: 6,
+          tailClip: 4,
         }
       : ellipsis;
->>>>>>> Stashed changes
 
   if (!address) {
     return null;
@@ -54,13 +37,9 @@ export const Address: React.FC<AddressProps> = (props) => {
   return (
     <Space>
       <Tooltip title={displayTooltip}>
-<<<<<<< Updated upstream
-        {isEllipsis ? `${filledAddress.slice(0, headClip)}...${filledAddress.slice(-tailClip)}` : filledAddress}
-=======
         {isEllipsis
-          ? `${filledAddress.slice(0, showHead)}...${filledAddress.slice(-showTail)}`
+          ? `${filledAddress.slice(0, headClip)}...${filledAddress.slice(-tailClip)}`
           : filledAddress}
->>>>>>> Stashed changes
       </Tooltip>
       {copyable && (
         <CopyOutlined