update db
merge