fix($resolve): use resolvefn result, not parent resolved value of same name

Made resolve values ignore any keys that we're actively trying to resolve, when they also exist in some parent state. closes #1353