compile the assets
updated database.yml
fixed merge conflict