Resolve conflicts in `config/routes/api.rb`

config/routes/api.rb

@@ -3,10 +3,5 @@ constraints(::Constraints::FeatureConstrainer.new(:graphql)) do
   mount GraphiQL::Rails::Engine, at: '/-/graphql-explorer', graphql_path: '/api/graphql'
 end
 
-<<<<<<< HEAD
 ::API::API.logger Rails.logger
 mount ::API::API => '/'
-=======
-API::API.logger Rails.logger
-mount API::API => '/'
->>>>>>> upstream/master