Update file1.txt
M
erge branch 'master' into xxx

Conflicts:
	file1.txt