merge fixes
db dump