Update conflict1.txt