update db class
merge