fixing a drawing bug of track
fixing some merge error