fix company_employees
fix merge prob