Merge Company and CompanyCategory