Fixing dijkstra and solve conflicts