confilict resolved?