change a.txt in a branch
deal conflict
Merge remote-tracking branch 'origin/a'