diff --git a/src/frontend/src/components/AccordionComponent/index.tsx b/src/frontend/src/components/AccordionComponent/index.tsx
index b7be94f0a..16a94bfd8 100644
--- a/src/frontend/src/components/AccordionComponent/index.tsx
+++ b/src/frontend/src/components/AccordionComponent/index.tsx
@@ -34,6 +34,7 @@ export default function AccordionComponent({
 
   return (
     <>
+<<<<<<< HEAD
       <Accordion
         type="single"
         className="w-full"
@@ -41,6 +42,10 @@ 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();
@@ -49,7 +54,9 @@ export default function AccordionComponent({
           >
             {trigger}
           </AccordionTrigger>
-          <AccordionContent>{children}</AccordionContent>
+          <AccordionContent className="AccordionContent">
+            {children}
+          </AccordionContent>
         </AccordionItem>
       </Accordion>
     </>
diff --git a/src/frontend/tailwind.config.js b/src/frontend/tailwind.config.js
index ef999b3d5..516553604 100644
--- a/src/frontend/tailwind.config.js
+++ b/src/frontend/tailwind.config.js
@@ -114,7 +114,7 @@ module.exports = {
       },
       fontFamily: {
         sans: ["var(--font-sans)", ...fontFamily.sans],
-      }
+      },
     },
   },