Solved conflicts in user model

app/models/user.rb

@@ -149,29 +149,17 @@ class User < Sequel::Model
     configuration = if options[:as]
       if options[:as] == :superuser
         ::Rails::Sequel.configuration.environment_for(Rails.env).merge(
-<<<<<<< HEAD
-          'database' => self.database_name, :logger => ::Rails.logger
-        )
-      elsif options[:as] == :public_user
-        ::Rails::Sequel.configuration.environment_for(Rails.env).merge(
-          'database' => self.database_name, :logger => ::Rails.logger,
-=======
           'database' => self.database_name, :logger => logger
         )
       elsif options[:as] == :public_user
         ::Rails::Sequel.configuration.environment_for(Rails.env).merge(
           'database' => self.database_name, :logger => logger,
->>>>>>> release/staging
           'username' => CartoDB::PUBLIC_DB_USER, 'password' => ''
         )
       end
     else
       ::Rails::Sequel.configuration.environment_for(Rails.env).merge(
-<<<<<<< HEAD
-        'database' => self.database_name, :logger => ::Rails.logger,
-=======
         'database' => self.database_name, :logger => logger,
->>>>>>> release/staging
         'username' => database_username, 'password' => database_password
       )
     end