remove confliction