Resolving Merge Conflicts from the GitLab UI | Hacker News Reader