Conflict resolution in rentals