Batch rename rework

Khalid Abu Shawaribrequested to merge
wip/kabus/batch-rename-revamp into main

Fixes the issue with conflict cycles and adds tests.

Merge request reports