bundled
database.yml
attempting to repair database yml
database merge issue
after amy