modify test.md
add b
Merge branch 'dev'
modify b
Merge branch 'dev'
modify b
modify b again
merge dev