Merge db into master