removed database
added new schema for database
merged to remove "non-fast-forward message"
All is OK
I'll add the new database in a few commits