resolving rental conflicts