Adding a change made locally
Merge remote branch 'origin/master'
Talking about sandwiches here