diff --git a/components/common/DialogContent/index.tsx b/components/common/DialogContent/index.tsx
index f0e48058..001f5426 100644
--- a/components/common/DialogContent/index.tsx
+++ b/components/common/DialogContent/index.tsx
@@ -12,13 +12,8 @@ interface Props
     HTMLDivElement
   > {
   wrapperClassName?: string
-<<<<<<< HEAD
   headerRef?: React.RefObject<HTMLDivElement>
   footerRef?: React.RefObject<HTMLDivElement>
-=======
-  headerref?: React.RefObject<HTMLDivElement>
-  footerref?: React.RefObject<HTMLDivElement>
->>>>>>> main
   scrollable?: boolean
   onEscapeKeyDown: (event: KeyboardEvent) => void
   onOpenAutoFocus: (event: Event) => void