resoved conflict in patch, company and renaming tools