bug fixed
modify b in b3
modify b.txt in master branch
solve the b.txt merge conflict
merge fixes branch
modify c.txt in master branch
modify d.txt in b3 branch