Resolve conflicts in app/helpers/environments_helper.rb

app/helpers/environments_helper.rb

@@ -11,10 +11,7 @@ module EnvironmentsHelper
     {
       "settings-path" => edit_project_service_path(project, 'prometheus'),
       "clusters-path" => project_clusters_path(project),
-<<<<<<< HEAD
-=======
       "current-environment-name": environment.name,
->>>>>>> upstream/master
       "documentation-path" => help_page_path('administration/monitoring/prometheus/index.md'),
       "empty-getting-started-svg-path" => image_path('illustrations/monitoring/getting_started.svg'),
       "empty-loading-svg-path" => image_path('illustrations/monitoring/loading.svg'),