Fix conflicts

Gemfile

@@ -33,16 +33,6 @@ gem 'omniauth-gitlab', '~> 1.0.2'
 gem 'omniauth-google-oauth2', '~> 0.4.1'
 gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
 gem 'omniauth-oauth2-generic', '~> 0.2.2'
-<<<<<<< HEAD
-gem 'omniauth-saml',          '~> 1.7.0'
-gem 'omniauth-shibboleth',    '~> 1.2.0'
-gem 'omniauth-twitter',       '~> 1.2.0'
-gem 'omniauth_crowd',         '~> 2.2.0'
-gem 'gssapi', group: :kerberos
-gem 'omniauth-authentiq',     '~> 0.3.0'
-gem 'rack-oauth2',            '~> 1.2.1'
-gem 'jwt',                    '~> 1.5.6'
-=======
 gem 'omniauth-saml', '~> 1.7.0'
 gem 'omniauth-shibboleth', '~> 1.2.0'
 gem 'omniauth-twitter', '~> 1.2.0'
@@ -50,7 +40,9 @@ gem 'omniauth_crowd', '~> 2.2.0'
 gem 'omniauth-authentiq', '~> 0.3.1'
 gem 'rack-oauth2', '~> 1.2.1'
 gem 'jwt', '~> 1.5.6'
->>>>>>> ce/master
+
+# Kerberos authentication. EE-only
+gem 'gssapi', group: :kerberos
 
 # Spam and anti-bot protection
 gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails'

app/controllers/concerns/issuable_collections.rb

@@ -52,11 +52,7 @@ module IssuableCollections
       # @filter_params[:authorized_only] = true
     end
 
-<<<<<<< HEAD
     @filter_params.permit(IssuableFinder::VALID_PARAMS)
-=======
-    @filter_params
->>>>>>> ce/master
   end
 
   def set_default_state

app/finders/issuable_finder.rb

@@ -23,13 +23,10 @@ class IssuableFinder
 
   NONE = '0'.freeze
   IRRELEVANT_PARAMS_FOR_CACHE_KEY = %i[utf8 sort page state].freeze
-<<<<<<< HEAD
 
   SCALAR_PARAMS = %i(scope state group_id project_id milestone_title assignee_id search label_name sort assignee_username author_id author_username authorized_only due_date iids non_archived weight).freeze
   ARRAY_PARAMS = { label_name: [], iids: [] }.freeze
   VALID_PARAMS = (SCALAR_PARAMS + [ARRAY_PARAMS]).freeze
-=======
->>>>>>> ce/master
 
   attr_accessor :current_user, :params