resolve some conflicts

app/serializers/environment_entity.rb

@@ -26,14 +26,13 @@ class EnvironmentEntity < Grape::Entity
       terminal_project_environment_path(environment.project, environment)
   end
 
-<<<<<<< HEAD
   expose :rollout_status_path, if: ->(environment, _) { environment.deployment_service_ready? } do |environment|
     can?(request.current_user, :read_deploy_board, environment.project) &&
       status_project_environment_path(environment.project, environment, format: :json)
-=======
+  end
+
   expose :folder_path do |environment|
     folder_project_environments_path(environment.project, environment.folder_name)
->>>>>>> upstream/master
   end
 
   expose :created_at, :updated_at

app/services/groups/create_service.rb

@@ -8,7 +8,6 @@ module Groups
     def execute
       @group = Group.new(params)
 
-<<<<<<< HEAD
       unless Gitlab::VisibilityLevel.allowed_for?(current_user, params[:visibility_level])
         deny_visibility_level(@group)
         return @group
@@ -21,10 +20,9 @@ module Groups
       if @group.parent && !can?(current_user, :create_subgroup, @group.parent)
         @group.parent = nil
         @group.errors.add(:parent_id, 'You don’t have permission to create a subgroup in this group.')
+      end
 
-=======
       unless can_use_visibility_level? && can_create_group?
->>>>>>> upstream/master
         return @group
       end
 

app/services/projects/update_service.rb

 module Projects
   class UpdateService < BaseService
     include UpdateVisibilityLevel
-<<<<<<< HEAD
+
     prepend ::EE::Projects::UpdateService
 
     def execute
@@ -9,10 +9,6 @@ module Projects
       limit = params.delete(:repository_size_limit)
       project.repository_size_limit = Gitlab::Utils.try_megabytes_to_bytes(limit) if limit
 
-=======
-
-    def execute
->>>>>>> upstream/master
       unless valid_visibility_level_change?(project, params[:visibility_level])
         return error('New visibility level not allowed!')
       end
@@ -44,7 +40,6 @@ module Projects
 
     private
 
-<<<<<<< HEAD
     def changing_storage_size?
       new_repository_storage = params[:repository_storage]
 
@@ -52,8 +47,6 @@ module Projects
         can?(current_user, :change_repository_storage, project)
     end
 
-=======
->>>>>>> upstream/master
     def renaming_project_with_container_registry_tags?
       new_path = params[:path]