Resolve conflict in top nav search

app/views/layouts/_search.html.haml

@@ -18,17 +18,10 @@
                                             spellcheck: false,
                                             tabindex: '1',
                                             autocomplete: 'off',
-<<<<<<< HEAD
-                                            data: { toggle: 'dropdown',
-                                              issues_path: issues_dashboard_path,
-                                              mr_path: merge_requests_dashboard_path },
-                                            aria: { label: 'Search' }
-=======
                                             data: { issues_path: issues_dashboard_path,
                                               mr_path: merge_requests_dashboard_path },
                                             aria: { label: 'Search' }
           %button.hidden.js-dropdown-search-toggle{ type: 'button', data: { toggle: 'dropdown' } }
->>>>>>> upstream/master
           .dropdown-menu.dropdown-select
             = dropdown_content do
               %ul