diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb
index df17ef9d9..4def393a5 100644
--- a/app/serializers/rest/instance_serializer.rb
+++ b/app/serializers/rest/instance_serializer.rb
@@ -11,7 +11,11 @@ class REST::InstanceSerializer < ActiveModel::Serializer
 
   attributes :domain, :title, :version, :source_url, :description,
              :usage, :thumbnail, :languages, :configuration,
+<<<<<<< HEAD
              :registrations, :feature_quote, :fedibird_capabilities
+=======
+             :registrations, :fedibird_capabilities
+>>>>>>> 5c5b42d42c (Fix third party app emoji reaction feature)
 
   has_one :contact, serializer: ContactSerializer
   has_many :rules, serializer: REST::RuleSerializer
@@ -96,6 +100,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer
   def feature_quote
     true
   end
+
   # for third party apps
   def fedibird_capabilities
     capabilities = [