add c.txt
change a.txt in a branch
change a.txt in c branch
deal conflict
Merge remote-tracking branch 'origin/a'
Merge remote-tracking branch 'origin/master' into b