Edit: resolver.py