Trying this
Merge branch 'refs/heads/develop'

Conflicts:
	bootstrap/start.php
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
Rename
Merge branch 'refs/heads/master' into develop