Edit in issue2 branch
Created conflicting edit between issue2 and hotfix2 branches
Commiting on master in order to solve conflict