remote and local
远程编辑master，本地编辑develop
Merge branch 'master' into develop

Conflicts:
	new.txt
add new file