Auto-merging packages/xai/src/responses/xai-responses-options.ts
CONFLICT (content): Merge conflict in packages/xai/src/responses/xai-responses-options.ts
Auto-merging packages/xai/src/xai-chat-options.ts
error: could not apply 3caa5443f... Backport: fix(xai): update model list - add GA models, remove beta variants (#13769)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"