modified b.txt in branch2
merge branch2 modifiend b.txt