How to Resolve Conflict with Tenants