冲突测试

测试修改同一个文件的冲突
Merge branch 'master' of https://github.com/shuiqianlinshixiaofendui/theirstories.git
Merge branch 'master' of https://github.com/shuiqianlinshixiaofendui/theirstories.git

Conflicts:
	hyn.txt
Merge branch 'master' of https://github.com/shuiqianlinshixiaofendui/theirstories.git

Conflicts:
	hyn.txt