rails update
Merged
migration