Implement resolving merge conflicts

Everyone can contribute. Help move this issue forward while earning points, leveling up and collecting rewards.

• Close this issue

We should adapt our existing merge conflict resolver app to support Rapid Diffs, since the diffs will be rendered on the server.