Workflow/UI for merge conflicts

[silldr1]

Create a workflow for merge conflicts when pulling changes

[timsehn]

Currently, when you try to merge a "PR" with conflicts you get this:

A UI here would be great and could be resued in Hosted and potentially DoltHub/DoltLab.