apartment conflict resolution