merging db into master