resolve `app/views/projects/issues/_nav_btns.html.haml`

resolve `spec/helpers/groups_helper_spec.rb`

app/views/projects/issues/_nav_btns.html.haml

 = link_to params.merge(rss_url_options), class: 'btn btn-default append-right-10 has-tooltip', title: 'Subscribe' do
   = icon('rss')
-<<<<<<< HEAD
 = render 'projects/issues/export_issues/button'
-=======
->>>>>>> ce-com/master
 - if @can_bulk_update
   = button_tag "Edit Issues", class: "btn btn-default append-right-10 js-bulk-update-toggle"
 = link_to "New issue", new_namespace_project_issue_path(@project.namespace,

spec/helpers/groups_helper_spec.rb

@@ -109,11 +109,7 @@ describe GroupsHelper do
     let(:deep_nested_group) { create(:group, parent: nested_group) }
     let!(:very_deep_nested_group) { create(:group, parent: deep_nested_group) }
 
-<<<<<<< HEAD
     it 'outputs the groups in the correct order', :postgresql do
-=======
-    it 'outputs the groups in the correct order' do
->>>>>>> ce-com/master
       expect(helper.group_title(very_deep_nested_group)).to match(/>#{group.name}<\/a>.*>#{nested_group.name}<\/a>.*>#{deep_nested_group.name}<\/a>/)
     end
   end