# Conflicts:
#   softwares/database/database.py
#   softwares/server/server.py