try using service code
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	Contents/Code/__init__.py