Description Issue #16538 / Merge Request !16693 will be disabling merge conflict resolution through the GitLab UI. As a follow up to this, we would like to find a way to VIEW merge conflicts through the GitLab UI. > There's a bit of coupling to the resolve conflicts view that someone is actually able to resolve things (i.e. entering a commit message, the "Use ours" and "Use theirs" message, etc.). If we just solve the problem at hand, I think it helps us figure out the next best step for viewing conflicts as a separate problem... It might be cool to have this baked into the MR widget itself (as opposed to a separate page) :shrug: ### Screenshots Current resolve conflicts UI is quite coupled to actually resolving conflicts  It'd be nice if there was a may to just **view** merge conflicts (maybe even within the merge request UI itself)? :thinking: