add bump
merge
fix merge
change dijkstra to work with new viz graph