The new conflict was only that status line. Upstream's longer change list is kept, with the #4943 language-list clause in front. Co-authored-by: Cursor <cursoragent@cursor.com>