rsolve conflicts