Update conflict-text.txt