# Conflicts:
#   umbra/controller.py
#   umbra/model.py
#   umbra/shadow_task.py
#   umbra/utils.py
#   umbra/view.py