Merging db changes into master