conflict c.txt
test conflict