diff --git a/src/styles/_dropdown.scss b/src/styles/_dropdown.scss
index f2dd6bf0..c48af97d 100644
--- a/src/styles/_dropdown.scss
+++ b/src/styles/_dropdown.scss
@@ -350,12 +350,9 @@
         background-color: $code-background;
         border-radius: 3px;
         font-family: Menlo, Monaco, Consolas, 'Courier New', monospace;
-<<<<<<< HEAD
-=======
         .algolia-docsearch-suggestion--highlight {
           background: none;
         }
->>>>>>> master
       }
 
       // Rules to display categories and subcategories