scaffold out db
merge