feature 2 via develop branch
fix bug via hot fix branch
Merge branch 'hotfix'
merge