Edit File: conflicts.yaml