Fixing merge history to show shortest_paths properly