fix conflict for database yml