change the confliction