Impossible to resolve conflicts in large merges due to wrong text box sizing and no scrollbar.

When creating merges with a lot of conflicting files, the text box that shows the report gets sized to its content, regardless of the visible space. As a result, there is no scrollbar or any action buttons visible.

The only workaround i have been using over the last months is to hit Ctrl+Return the apply any changes blindly.