添加commit的說明
添加pull的說明
Merge branch 'issue3'

Conflicts:
	myfile.txt
resove