conflict resolve code path