resolve confilict