Add a new file
Merge remote-tracking branch 'origin/master' into my-branch