Fix wrong conflict resolution

Signed-off-by: Rémy Coutable <remy@rymai.me>

spec/features/issues/filtered_search/search_bar_spec.rb

@@ -101,7 +101,7 @@ describe 'Search bar', js: true, feature: true do
       find('.filtered-search-box .clear-search').click
       filtered_search.click
 
-      expect(find('#js-dropdown-hint')).to have_selector('.filter-dropdown .filter-dropdown-item', count: 4)
+      expect(find('#js-dropdown-hint')).to have_selector('.filter-dropdown .filter-dropdown-item', count: 5)
       expect(get_left_style(find('#js-dropdown-hint')['style'])).to eq(hint_offset)
     end
   end