Update database.yml

fixed merging conflict!