Update shortcodes-and-filters.yml to add table-cell-merge

Update shortcodes-and-filters.yml to add table-cell-merge #3469