fixing database.yaml merge conflict