Fixed merge issues with database __init__.py file.