Edit: resolve.py