Merge branch 'my-feature-branch'
Another file
Merge branch 'master' into my-feature-branch