add a.txt
delete a.txt
add line 2 in no.txt
add a new line in yes.txt
add a new line in yes.txt again in master
conflict fixed