return ResolveResult.make(context, this);
        } else {
            try {
<<<<<<< HEAD
                ResolveModifier modifier = new ResolveModifier(context, source.pushParent(this));
                SimpleConfigList value = modifyMayThrow(modifier, ResolveStatus.RESOLVED);
                return ResolveResult.make(modifier.context, value);
=======
                return modifyMayThrow(new Modifier() {
                    @Override
                    public AbstractConfigValue modifyChildMayThrow(String key, AbstractConfigValue v)
                            throws NotPossibleToResolve {
                        return context.resolve(v);
                    }
                }, context.options().getAllowUnresolved() ? null : ResolveStatus.RESOLVED);
>>>>>>> 197be59fec36de09accaf91c6e3cf90a75c011fe
            } catch (NotPossibleToResolve e) {
                throw e;
            } catch (RuntimeException e) {

            return ResolveResult.make(context, this);
        } else {
            try {
                ResolveModifier modifier = new ResolveModifier(context, source.pushParent(this));
                SimpleConfigList value = modifyMayThrow(modifier, context.options().getAllowUnresolved() ? null : ResolveStatus.RESOLVED);
                return ResolveResult.make(modifier.context, value);
            } catch (NotPossibleToResolve e) {
                throw e;
            } catch (RuntimeException e) {