hotfix commit
cool new feature
Merge branch 'hotfix'
Merge branch 'newFeature'