confilict fix