conflict resolution window too big

The conflict resolution window extends off the bottom of the screen on my laptop, so I can't easily get at the "next" button.

This is an old discussion that has not been active in a long time. Instead of commenting here, you should start a new discussion. If you think the content of this discussion is still relevant, you can link to it from your new discussion.