change db/schema.rb
merged to local the actual stuff
update local stuff
update local stuff
update local stuff