Amended commit with a new line in file1
Merge branch 'master' of https://github.com/vmihellhale/my_repo