edit sample.py
solve the conflict