Fix bad merge conflict

app/helpers/issuables_helper.rb

@@ -169,7 +169,7 @@ module IssuablesHelper
 
     if display_count
       count = issuables_count_for_state(issuable_type, state)
-      html << " " << content_tag(:span, number_with_delimiter(count), class: 'badge')
+      html << " " << content_tag(:span, number_with_delimiter(count), class: 'badge badge-pill')
     end
 
     html.html_safe

app/views/projects/commits/_commit.html.haml

@@ -59,5 +59,5 @@
         .commit-sha-group
           .label.label-monospace
             = commit.short_id
-          = clipboard_button(text: commit.id, title: _("Copy commit SHA to clipboard"), class: "btn btn-default", container: "body")
+          = clipboard_button(text: commit.id, title: _("Copy commit SHA to clipboard"), class: "btn btn-secondary", container: "body")
           = link_to_browse_code(project, commit)