Fix stale import caused by merge race

Merged akwizgran requested to merge fix-imports into main

Merge request reports