committing file1 before merge
committing again before merge
Merge branch 'master' of https://github.com/akanevm/tests2