fix conflict in database.yml