分支2操作文件
Merge branch 'branch2'

Conflicts:
	branch2-read.txt