resolved the confilict