conflict resolution attempt