diff --git a/doc/upstream.md b/doc/upstream.md
index 5943105..426ae03 100644
--- a/doc/upstream.md
+++ b/doc/upstream.md
@@ -77,7 +77,7 @@ issues against this fork.
 | [#416](https://github.com/stevearc/oil.nvim/issues/416) | Cannot remap key to open split                             | open                                                                                                        |
 | [#431](https://github.com/stevearc/oil.nvim/issues/431) | More SSH adapter documentation                             | duplicate of [#525](https://github.com/stevearc/oil.nvim/issues/525)                                        |
 | [#435](https://github.com/stevearc/oil.nvim/issues/435) | Error previewing with semantic tokens LSP                  | fixed — cherry-picked ([#467](https://github.com/stevearc/oil.nvim/pull/467))                               |
-| [#436](https://github.com/stevearc/oil.nvim/issues/436) | Owner and group columns                                    | open                                                                                                        |
+| [#436](https://github.com/stevearc/oil.nvim/issues/436) | Owner and group columns                                    | consolidated into [#126](https://github.com/barrettruth/canola.nvim/issues/126)                             |
 | [#444](https://github.com/stevearc/oil.nvim/issues/444) | Opening behaviour customization                            | open                                                                                                        |
 | [#446](https://github.com/stevearc/oil.nvim/issues/446) | Executable highlighting                                    | cherry-picked ([#698](https://github.com/stevearc/oil.nvim/pull/698))                                       |
 | [#449](https://github.com/stevearc/oil.nvim/issues/449) | Renaming TypeScript files stopped working                  | open                                                                                                        |
@@ -98,7 +98,7 @@ issues against this fork.
 | [#571](https://github.com/stevearc/oil.nvim/issues/571) | Callback before `highlight_filename`                       | open                                                                                                        |
 | [#578](https://github.com/stevearc/oil.nvim/issues/578) | Hidden file dimming recipe                                 | fixed                                                                                                       |
 | [#587](https://github.com/stevearc/oil.nvim/issues/587) | Alt+h keymap                                               | not actionable — user config issue                                                                          |
-| [#599](https://github.com/stevearc/oil.nvim/issues/599) | user:group display and manipulation                        | open                                                                                                        |
+| [#599](https://github.com/stevearc/oil.nvim/issues/599) | user:group display and manipulation                        | consolidated into [#126](https://github.com/barrettruth/canola.nvim/issues/126)                             |
 | [#607](https://github.com/stevearc/oil.nvim/issues/607) | Per-host SCP args                                          | open                                                                                                        |
 | [#609](https://github.com/stevearc/oil.nvim/issues/609) | Cursor placement via Snacks picker                         | not actionable — Windows-only                                                                               |
 | [#612](https://github.com/stevearc/oil.nvim/issues/612) | Delete buffers on file delete                              | fixed                                                                                                       |
@@ -130,7 +130,7 @@ issues against this fork.
 | [#679](https://github.com/stevearc/oil.nvim/issues/679) | Executable file sign                                       | cherry-picked ([#698](https://github.com/stevearc/oil.nvim/pull/698))                                       |
 | [#682](https://github.com/stevearc/oil.nvim/issues/682) | `get_current_dir()` nil                                    | cherry-picked ([#727](https://github.com/stevearc/oil.nvim/pull/727))                                       |
 | [#683](https://github.com/stevearc/oil.nvim/issues/683) | Path not shown in floating mode                            | fixed                                                                                                       |
-| [#684](https://github.com/stevearc/oil.nvim/issues/684) | User and group columns                                     | open                                                                                                        |
+| [#684](https://github.com/stevearc/oil.nvim/issues/684) | User and group columns                                     | consolidated into [#126](https://github.com/barrettruth/canola.nvim/issues/126)                             |
 | [#685](https://github.com/stevearc/oil.nvim/issues/685) | Plain directory paths in buffer names                      | not actionable — protocol prefix is fundamental to buffer identity                                          |
 | [#690](https://github.com/stevearc/oil.nvim/issues/690) | `OilFileIcon` highlight group                              | fixed                                                                                                       |
 | [#692](https://github.com/stevearc/oil.nvim/issues/692) | Keymap normalization                                       | cherry-picked ([#725](https://github.com/stevearc/oil.nvim/pull/725))                                       |