There is a merge conflict in the 'main' branch; please resolve it.

[xydz]

Before submitting your bug report

• [ ] I believe this is a bug. I'll try to join the Continue Discord for questions
• [ ] I'm not able to find an open issue that reports the same bug
• [ ] I've seen the troubleshooting guide on the Continue Docs

Relevant environment info

- OS:
- Continue:
- IDE:

Description

To reproduce

No response

Log output

No response