a dev.txt for branch dev
a new file for master
Merge branch 'dev'
 a