bold and italics (but not bold italics, p.s. I hate the first person to point this out)
Merge remote-tracking branch 'origin/master'