Improve documentation on plugin's features

[RayBB]

Describe the bug

IMO it isn't super clear that this plugin has an amazing merge conflict editor, which is super helpful. I think you should mention this right in the first line saying this can be used to resolve conflicts.

Thanks for all your hard work with this! The plugin is great :)

To Reproduce

Expected behavior

Screenshots

Desktop (please complete the following information):

• OS:
• Browser:
• Version:

Smartphone (please complete the following information):

• Device:
• OS:
• Browser:
• Version:

Additional context