Resolve conflict in `app/views/shared/boards/components/_board.html.haml`

app/views/shared/boards/components/_board.html.haml

@@ -39,16 +39,6 @@
             {{ list.issuesSize }}
           = render_if_exists "shared/boards/components/list_weight"
 
-<<<<<<< HEAD
-        - if can?(current_user, :admin_list, current_board_parent)
-          %button.issue-count-badge-add-button.btn.btn-sm.btn-default.ml-1.has-tooltip.js-no-trigger-collapse{ type: "button",
-            "@click" => "showNewIssueForm",
-            "v-if" => 'list.type !== "closed"',
-            "aria-label" => _("New issue"),
-            "title" => _("New issue"),
-            data: { placement: "top", container: "body" } }
-            = icon("plus", class: "js-no-trigger-collapse")
-=======
         %button.issue-count-badge-add-button.btn.btn-sm.btn-default.ml-1.has-tooltip.js-no-trigger-collapse{ type: "button",
           "@click" => "showNewIssueForm",
           "v-if" => "isNewIssueShown",
@@ -57,7 +47,6 @@
           data: { placement: "top", container: "body" } }
           = icon("plus", class: "js-no-trigger-collapse")
 
->>>>>>> upstream/master
     %board-list{ "v-if" => 'list.type !== "blank" && list.type !== "promotion"',
       ":list" => "list",
       ":issues" => "list.issues",