Fix weird merge forward in FAQ