random change on master branch whilst someone does a hot fix on another branch
hot fix for SECOND issue
hot fix for SECOND issue part 2
Merging branch: temp-hotfix with no-ff