actually resolve conflict