Update conflict.txt