edit a.txt
Merge branch 'dev'