Fixed database and tables
Merge conflicts
Merge conflicts2