Detachable merge conflicts modal

We've introduced the ability to detach the merge conflicts modal into a separate window. This feature allows you to resolve complex conflicts more easily by viewing both the conflict and the Storyboard in separate windows that you can then size to your desired dimensions.