rails app:update
We accepted some changes as-is, but for development.rb and production.rb we read the diff and manually edited them!
