Dijkstra ignore reserved edges
Merge branch 'new_dijk'