Resolve merge conflicts

app/assets/javascripts/monitoring/components/dashboard.vue

@@ -247,7 +247,6 @@ export default {
         :small-graph="forceSmallGraph"
       >
         <!-- EE content -->
-<<<<<<< HEAD
         <template slot="additionalSvgContent" scope="{ graphDrawData }">
           <threshold-lines
             v-for="(alert, alertName) in alertData[graphData.id]"
@@ -266,9 +265,6 @@ export default {
           :alert-data="alertData[graphData.id]"
           @setAlerts="setAlerts"
         />
-=======
-        {{ null }}
->>>>>>> upstream/master
       </component>
     </graph-group>
   </div>

app/controllers/projects/environments_controller.rb

@@ -15,11 +15,8 @@ class Projects::EnvironmentsController < Projects::ApplicationController
     push_frontend_feature_flag(:area_chart, project)
   end
 
-<<<<<<< HEAD
   prepend ::EE::Projects::EnvironmentsController
 
-=======
->>>>>>> upstream/master
   def index
     @environments = project.environments
       .with_state(params[:scope] || :available)

locale/gitlab.pot

@@ -113,12 +113,9 @@ msgstr[1] ""
 msgid "%{actionText} & %{openOrClose} %{noteable}"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "%{authorsName}'s discussion"
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "%{bio} at %{organization}"
 msgstr ""
 
@@ -8217,12 +8214,9 @@ msgstr ""
 msgid "Started %{startsIn}"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Starting..."
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "Starts %{startsIn}"
 msgstr ""