add b.txt on branch branch1
add d.txt on branch1
Merge branch 'master' into branch1