...
merge db.c