dijkstra now working
merging