Some git notes
Some git notes
Merged branch hotfix
Merge hotfix master