can't win for losing!! this should help though
Merge branch 'hotfix' into develop
Merge branch 'develop'