Update the file
Merge branch 'master' into update-a

Conflicts:
	test-folder/sample-234.txt
Merge branch 'update-a'