Cleanup
Dont use git protocol
Merge branch 'develop'