different account try
Merge branch 'master' of ssh://git@github.com/ZZhiming/testfork.git

Conflicts:
	zhiming.txt