merge bug
db wipe