Merge pull request #36898 from rtdany10/company-ambiguous

fix: `company` is ambiguous