resolved conflict in db_adaptor.py