a.txt
Merge branch 'test' into beta

Conflicts:
	a.txt