Add SQL dump of the database structure
Fixed merge conflict