vim edit it
Merge branch 'master' of https://github.com/luckyaibin/Test

Conflicts:
	README.md