main moved to 952c328b3. The conflicts were the new catalog rows beside main's path rows, the status line and history table of docs/ui-parity.md, and extra_windows in canvas/tabs.rs, which now passes main's focused flag while drawing_window names the window. The Scroll All Windows tests build DocWindow with main's floating and focused fields, the Hand drag's follow step moved into scroll_all_windows::follow_drag, and main's new ar, da, fi, hi, nb and sv catalogs get the Scroll All Windows row.