resolve some conflict