schema modified
merged and rake db:migrate