add a.txt
, add b.txt
2nd commit
merge