values-based conflict resolution