local database changes
db merging problems