addding new line
Merge branch 'master' into some_branch
making another commit some time later