recreate a.txt
Merge branch 'develop'
change b.txt
resovle confilct
deal with a.txt
edit a.txt