Migrate and bundle doesn't work properly with rebase.
Don't continue until the rebase has succeeded.
Moved back to the rails functions file.