Add company permissions to acl
fix merge conflicts