diff --git a/component-definition.json b/component-definition.json
index 5c1048f..4749151 100644
--- a/component-definition.json
+++ b/component-definition.json
@@ -675,7 +675,6 @@
               }
             }
           }
-<<<<<<< HEAD
         },
         {
           "title": "Order Accordion",
@@ -708,8 +707,6 @@
               }
             }
           }
-=======
->>>>>>> main
         }
       ]
     }
diff --git a/component-filters.json b/component-filters.json
index a7ae2be..e928283 100644
--- a/component-filters.json
+++ b/component-filters.json
@@ -17,13 +17,9 @@
       "columns",
       "fragment",
       "form",
-<<<<<<< HEAD
       "embed-adaptive-form",
       "order-accordion",
       "order-status"
-=======
-      "embed-adaptive-form"
->>>>>>> main
     ]
   },
   {