A plugin was developed in order to make the process of resolving conflicts easier. It provides a nice diff-window in which you can see the differences between your current note and the note received from cloud.
The plugin could be considered to be made of 5 parts: