add new file
update m.txt
update a.txt
update
update a.txt
update
add new file
update a file
update b.txt & add new file
Merge branch 'master' into test

Conflicts:
	a.txt