fix remaining conflict