Previously, the merge function would override the entire default table during a
merge if a matching table was found in the override table.
This would prevent users from modifying a single setting (for instance changing
just a single icon, rather than the whole thing)
d92cf39dd7