pastRoute
fixed merge conflict in pastRoute