Resolving Merge Conflicts from the GitLab UI

Introduced the ability to resolve merge conflicts directly within the GitLab UI. This feature allows users to fix conflicts without needing to check out branches locally. The implementation supports text-based conflicts and provides an editor for manual resolution. Future plans include support for binary files and renames.