reset
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	MY_PRJ_1/File1.txt
add ddd