changed database.yml
fixed merge conflict