master update file1
server develop update file1.txt
Merge branch 'develop'

Conflicts:
	file1.txt
Merge branch 'master' of https://github.com/github888888/gitdemo

Conflicts:
	file1.txt