Resolve conflicts in app/models/project_feature.rb

app/models/project_feature.rb

@@ -54,15 +54,12 @@ class ProjectFeature < ActiveRecord::Base
   default_value_for :wiki_access_level,           value: ENABLED, allows_nil: false
   default_value_for :repository_access_level,     value: ENABLED, allows_nil: false
 
-<<<<<<< HEAD
   after_commit on: :update do
     if Gitlab::CurrentSettings.current_application_settings.elasticsearch_indexing?
       ElasticIndexerWorker.perform_async(:update, 'Project', project_id)
     end
   end
 
-=======
->>>>>>> upstream/master
   def feature_available?(feature, user)
     get_permission(user, access_level(feature))
   end