Issue with FAQ schema when added to Baseline theme

We added the FAQ schema to the theme but had a "duplicate" error shown on Google Search Console due to adding multiple FAQ blocks to the same page to allow for different topics.

A work around, we added a "heading" field within the FAQ block similar, this allowed us to replaced the multiple FAQ blocks with a single FAQ, unified block that now supports optional “heading” fields to group questions.