Resolve the merge conflict in database/__init__.py

[madushan1000]

There is a merge conflict committed into the database/init.py which crash appmon at start. Cleared it out.