Resolve conflicts in db1.py and dbcal.py