Resolve conflicts in issuables_helper.rb

app/controllers/dashboard_controller.rb

@@ -6,6 +6,7 @@ class DashboardController < Dashboard::ApplicationController
     :author_id,
     :assignee_id,
     :milestone_title,
+    :weight,
     :label_name
   ].freeze
 

app/helpers/issuables_helper.rb

@@ -159,11 +159,7 @@ module IssuablesHelper
     label_names.join(', ')
   end
 
-<<<<<<< HEAD
-  def issuables_state_counter_text(issuable_type, state = :all)
-=======
   def issuables_state_counter_text(issuable_type, state, display_count)
->>>>>>> 37193ac0da0... Check if at least one filter is set on dashboard
     titles = {
       opened: "Open"
     }
@@ -197,20 +193,6 @@ module IssuablesHelper
     end
   end
 
-<<<<<<< HEAD
-  def issuable_filter_params
-    [
-      :search,
-      :author_id,
-      :assignee_id,
-      :milestone_title,
-      :weight,
-      :label_name
-    ]
-  end
-
-=======
->>>>>>> 37193ac0da0... Check if at least one filter is set on dashboard
   def issuable_reference(issuable)
     @show_full_reference ? issuable.to_reference(full: true) : issuable.to_reference(@group || @project)
   end

ee/app/views/shared/issuable/_epic_nav.html.haml

 - type = local_assigns.fetch(:type, :epics)
 - page_context_word = type.to_s.humanize(capitalize: false)
+- display_count = local_assigns.fetch(:display_count, :true)
 
 %ul.nav-links.epics-state-filters
-  = render 'shared/issuable/nav_links/all', page_context_word: page_context_word, counter: issuables_state_counter_text(type, :all)
-
+  = render 'shared/issuable/nav_links/all', page_context_word: page_context_word, counter: issuables_state_counter_text(type, :all, display_count)