some merge junk left in faq.html - not sure why I wasn't finding it in project search