rake db changes
fixed merge conflicts