merge: resolve acp-client conflict with process-tree kill

Co-authored-by: Cursor <cursoragent@cursor.com>