Fix merge in faq

Ping @coffeemug, @chipotle -- Could one of you take a quick look?
I'll deploy after that.