add b.txt
Merge remote-tracking branch 'origin/master'
change a by user1
merge a.txt