different change, commit 2
Merge branch 'master' of https://github.com/kongscn/try

Conflicts:
	file.txt