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