Current database setup
fixing merging
fixing database setup