resolve the confilict