Confliuct resolving

app/helpers/issuables_helper.rb

@@ -158,12 +158,8 @@ module IssuablesHelper
       :author_id,
       :assignee_id,
       :milestone_title,
-<<<<<<< HEAD
-      :label_name,
-      :weight
-=======
+      :weight,
       :label_name
->>>>>>> 14046b9c734e5e6506d63276f39f3f9d770c3699
     ]
   end
 
@@ -194,18 +190,9 @@ module IssuablesHelper
   end
 
   def issuables_count_for_state(issuable_type, state)
-<<<<<<< HEAD
-    issuables_finder = public_send("#{issuable_type}_finder")
-
-    params = issuables_finder.params.merge(state: state)
-    finder = issuables_finder.class.new(issuables_finder.current_user, params)
-
-    finder.execute.page(1).total_count
-=======
     @counts ||= {}
     @counts[issuable_type] ||= public_send("#{issuable_type}_finder").count_by_state
     @counts[issuable_type][state]
->>>>>>> 14046b9c734e5e6506d63276f39f3f9d770c3699
   end
 
   IRRELEVANT_PARAMS_FOR_CACHE_KEY = %i[utf8 sort page]

app/services/system_note_service.rb

@@ -105,7 +105,6 @@ module SystemNoteService
   # Returns the created Note object
   def change_milestone(noteable, project, author, milestone)
     body = milestone.nil? ? 'removed milestone' : "changed milestone to #{milestone.to_reference(project)}"
-<<<<<<< HEAD
 
     create_note(noteable: noteable, project: project, author: author, note: body)
   end
@@ -157,8 +156,6 @@ module SystemNoteService
       action = time_spent > 0 ? 'Added' : 'Subtracted'
       body = "#{action} #{parsed_time} of time spent on this #{noteable.human_class_name}"
     end
-=======
->>>>>>> 14046b9c734e5e6506d63276f39f3f9d770c3699
 
     create_note(noteable: noteable, project: project, author: author, note: body)
   end

spec/features/security/project/private_access_spec.rb

@@ -348,7 +348,6 @@ describe "Private Project Access", feature: true  do
     it { is_expected.to be_denied_for(:user) }
     it { is_expected.to be_denied_for(:external) }
     it { is_expected.to be_denied_for(:visitor) }
-<<<<<<< HEAD
   end
 
   context "when license blocks changes" do
@@ -377,8 +376,6 @@ describe "Private Project Access", feature: true  do
       it { is_expected.to be_denied_for(:user) }
       it { is_expected.to be_denied_for(:visitor) }
     end
-=======
->>>>>>> 14046b9c734e5e6506d63276f39f3f9d770c3699
   end
 
   describe "GET /:project_path/container_registry" do

spec/features/security/project/public_access_spec.rb

@@ -412,7 +412,6 @@ describe "Public Project Access", feature: true  do
     it { is_expected.to be_denied_for(:user) }
     it { is_expected.to be_denied_for(:external) }
     it { is_expected.to be_denied_for(:visitor) }
-<<<<<<< HEAD
   end
 
   context "when license blocks changes" do
@@ -441,8 +440,6 @@ describe "Public Project Access", feature: true  do
       it { is_expected.to be_denied_for(:user) }
       it { is_expected.to be_denied_for(:visitor) }
     end
-=======
->>>>>>> 14046b9c734e5e6506d63276f39f3f9d770c3699
   end
 
   describe "GET /:project_path/container_registry" do