New resolver: Tweak resolution logic to improve user experience when
user-supplied requirements conflict.