Adding a message
Merge master into my-branch
Merge my-branch into master