add c.txt
commit branch2
Merge branch 'branch1'
modified b.txt in branch1