Edits to conflict.txt