Will create merge conflict 2
Merge branch 'master' of https://github.com/octaviantarasa/Incercare2