+ c.txt
Merge branch 'slave'