Resolve some conflict