diff --git a/src/frontend/src/components/AccordionComponent/index.tsx b/src/frontend/src/components/AccordionComponent/index.tsx
index 16a94bfd8..5f5c61b2f 100644
--- a/src/frontend/src/components/AccordionComponent/index.tsx
+++ b/src/frontend/src/components/AccordionComponent/index.tsx
@@ -34,7 +34,6 @@ export default function AccordionComponent({
 
   return (
     <>
-<<<<<<< HEAD
       <Accordion
         type="single"
         className="w-full"
@@ -42,10 +41,6 @@ export default function AccordionComponent({
         onValueChange={setValue}
       >
         <AccordionItem value={keyValue} className="border-b">
-=======
-      <Accordion type="single" value={value} onValueChange={setValue}>
-        <AccordionItem value={trigger} className="border-none">
->>>>>>> bugfix-accordion
           <AccordionTrigger
             onClick={() => {
               handleClick();