this is a new commit
:
I
:i
kdllqw
Merge branch 'master' of https://github.com/tobyqingnan/git-test

Conflicts:
	test.txt