Fix Height for Resolve Conflicts Dialog

[alexknop]

Problem:

-With multiple conflicts to fix, sometimes the dialog box would expand beyond the screen in height and could not be resized to a smaller height.

Solution:

-Adjusted height based on content
-Set more reasonable minimum height

Fixes #7785 #6228