add new changes for db
merge branch and local changes