added an extra condition for clarity
Merge remote-tracking branch 'origin/master'