update a.txt
add c.txt
update a to 100
add d.txt
conflict resolve