local develop branch change
remote change
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	README.md
commit merge conflicts
remove temp file
Merge branch 'develop'