myFeature
myfeature2
release commit
Merge branch 'release/93' into develop

Conflicts:
	whoami