test command fetch
Merge branch 'master' of git@github.com:chujieyang/notes.git

Conflicts:
	gitconflic.txt