Thanks for the feedback on #896. I've created this new PR, which merges into #896, to address your comment. I will work on the changes and keep this PR's description up to date as I make progress.

Original PR: #896
Triggering comment (#896 (comment)):

@copilot fix conflicts.

✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.