Resolving sync conflicts

I've just been trying out a few scenarios where sync conflicts can appear and I've observed two cases.

1. Wrote a few words in a paragraph at the same location on two devices. After synchronization one was gone without a trace.
2. Later, conflicts were reported and a separate page was created. This is useful.

The default behaviour is positive in that no changes simply get lost. I could not reproduce the point #1, as the conflict page was generated fine.

I would like to ask what people do in such case. If the document is long, it is difficult to notice what has changed. Is there any built-in mechanism for dealing with conflicts or do people export / copy-paste elsewhere to compare?

Would it be useful to make some kind of diff view where two notes can be compared? This would be useful for conflict notes.