check how the conflict be resolved
Merge branch 'master' of https://github.com/yukuansong/python001

Conflicts:
	myfile.txt
Merge branch 'master' of https://github.com/yukuansong/python001