deleted db to eliminate merge conflict