updated prep.py
fixed conflict