bunch of changes
resolving merge (drop database)
cleanup