add in_master.txt
modify a.txt
Merge branch 'master' into dev