Resolve conflicts in environment_entity.rb

app/serializers/environment_entity.rb

@@ -10,11 +10,7 @@ class EnvironmentEntity < Grape::Entity
   expose :environment_type
   expose :last_deployment, using: DeploymentEntity
   expose :stop_action_available?, as: :has_stop_action
-<<<<<<< HEAD
-
   expose :rollout_status, if: -> (*) { can_read_deploy_board? }, using: RolloutStatusEntity
-=======
->>>>>>> upstream/master
 
   expose :metrics_path, if: -> (*) { environment.has_metrics? } do |environment|
     metrics_project_environment_path(environment.project, environment)