Conflicts were only the status lines and revision history in the type and UI parity docs. Both sides are kept. Language entries, catalogs and tests merged cleanly, so local CI was not rerun. Co-authored-by: Cursor <cursoragent@cursor.com>