Modify a.txt
Merge branch 'master' into a
a > master