Edit File: conflicts.py