This was merged in earlier?

git checkout db/schema.rb
rake db:migrate