resolving tenancy conflicts