Multi device, conflict resolution
Another good tool is ZimWiki but the limitations of desktop only applies .
But to me cross device Joplin works brilliantly.