Update Conflict.txt