add conflict0.txt