diff --git a/src/docs/Components/ListBox/previews/default.preview.html b/src/docs/Components/ListBox/previews/default.preview.html
index feb17da12..0d1afb822 100644
--- a/src/docs/Components/ListBox/previews/default.preview.html
+++ b/src/docs/Components/ListBox/previews/default.preview.html
@@ -3,21 +3,12 @@
     tabindex="-1"
     role="listbox"
     aria-labelledby="lisbox"
-<<<<<<< HEAD
-    class="mc-listbox is-open is-focus"
-  >
-    <li class="mc-listbox__item is-focus is-checked" role="option">
-      <span class="mc-listbox__label">Option label</span>
-    </li>
-    <li class="mc-listbox__item is-disabled" role="option">
-=======
     class="mc-listbox is-open"
   >
     <li class="mc-listbox__item is-checked" role="option">
       <span class="mc-listbox__label">Option label</span>
     </li>
     <li class="mc-listbox__item" role="option">
->>>>>>> 9eb36dfde80469d05513783b05bfe12cda44cd1c
       <span class="mc-listbox__label">Option label</span>
     </li>
     <li class="mc-listbox__item" role="option">