confilict resolved