Merged database into master