modified c.txt
test conflict
modified by master
modified conflict