Resolve conflicts in app/views/clusters/clusters/_sidebar.html.haml

app/views/clusters/clusters/_sidebar.html.haml

-<<<<<<< HEAD
 - autodevops_help_url = help_page_path('topics/autodevops/index.md', anchor: 'using-multiple-kubernetes-clusters-premium')
 - help_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe
 - help_link_end = '</a>'.html_safe
-=======
->>>>>>> upstream/master
 %h4.prepend-top-0
   = s_('ClusterIntegration|Add a Kubernetes cluster integration')
 %p
   = clusterable.sidebar_text
 %p
   = clusterable.learn_more_link
-<<<<<<< HEAD
 %p
   = s_('ClusterIntegration|If you are setting up multiple clusters and are using Auto DevOps, %{help_link_start}read this first%{help_link_end}.').html_safe % { help_link_start: help_link_start % { url: autodevops_help_url }, help_link_end: help_link_end }
-=======
->>>>>>> upstream/master