Small fixes on rich text page

[juliendelplanque]

• Removed duplicated code from conflict resolution
• Changed Notice section to Note: with note style (as on other pages)
• Removed dot from section name
• Moved explanation at beginning to color section
• Added toc as the page gets bigger

[juliendelplanque]

@kasperosterbye You might be interested by this change

[kasperosterbye]

Great - I believe I code better than I write, so all help is always appreciated (help for code is nice too btw).

[juliendelplanque]

What you wrote is super nice.

Just that, with time, we need to apply refactoring to wiki pages as well as to source code.