Resolved conflict in db.py