fix: merge settings and versionedSettings for Roo provider models#10030

cte merged 1 commit intomainRooCodeInc/Roo-Code:mainfrom

fix/merge-settings-and-versioned-settingsRooCodeInc/Roo-Code:fix/merge-settings-and-versioned-settingsCopy head branch name to clipboard