resolve confliction: