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