fixed merge conflict
new schema for Database
fixed bugs