Implement resolving merge conflicts
<!--IssueSummary start--> <details> <summary> Everyone can contribute. [Help move this issue forward](https://handbook.gitlab.com/handbook/marketing/developer-relations/contributor-success/community-contributors-workflows/#contributor-links) while earning points, leveling up and collecting rewards. </summary> - [Close this issue](https://contributors.gitlab.com/manage-issue?action=close&projectId=278964&issueIid=500416) </details> <!--IssueSummary end--> We should adapt our existing merge conflict resolver app to support Rapid Diffs, since the diffs will be rendered on the server.
issue