my feature branch
xMerge branch 'my-feature' into develop

Conflicts:
	develop
	master
	master-feature