dijkstra now working
fixed merge conflicts