solve confliction