Binary Change in Branch

The master has already changed
Merge branch 'BinaryTest'

Conflicts:
	This is a test.docx