fix: resolved conflicts in database.py
fix: resolved conflicts in database.py
frappe/frappe,StrellaGroup/frappe,yashodhank/frappe,yashodhank/frappe,StrellaGroup/frappe,StrellaGroup/frappe,yashodhank/frappe,frappe/frappe,yashodhank/frappe,frappe/frappe