update data.py
fix merge changes
updated data.py to hackaton version