crate a conflict test file
Merge branch 'master' of github.com:dehuimao/test

Conflicts:
	test2.txt