merge schema.rb