modified track_predictor.py
resolved conflicts