[ci skip] Resolve clusters/index.html.haml conflict

app/views/projects/clusters/index.html.haml

@@ -8,11 +8,8 @@
     .top-area.adjust
       .nav-text
         = s_("ClusterIntegration|Clusters can be used to deploy applications and to provide Review Apps for this project")
-<<<<<<< HEAD
       = render 'projects/ee/clusters/buttons', project: @project
-=======
     .ci-table.js-clusters-list
->>>>>>> upstream/master
       .gl-responsive-table-row.table-row-header{ role: "row" }
         .table-section.section-30{ role: "rowheader" }
           = s_("ClusterIntegration|Cluster")