fixed merge conflict in database.yml