confliction solved