[EDIT] FILE: conflicts.py

CANCEL