modified b.txt in branch1
merge branch2 modifiend b.txt
Merge branch 'master' into branch2