Simple Solution
compound conditions and comments
Merge remote-tracking branch 'origin/master' into working