modified:   exp.py
- conflict resolved