Fix conflicts in `app/services/application_settings/update_service.rb`

app/services/application_settings/update_service.rb

 module ApplicationSettings
   class UpdateService < ApplicationSettings::BaseService
     def execute
-<<<<<<< HEAD
       # Repository size limit comes as MB from the view
       limit = @params.delete(:repository_size_limit)
       @application_setting.repository_size_limit = Gitlab::Utils.try_megabytes_to_bytes(limit) if limit
 
-=======
->>>>>>> upstream/master
       update_terms(@params.delete(:terms))
 
       @application_setting.update(@params)