merge schema
merge
merge schema.rb
merge