I haven't implemented IndexedEntity yet, It still isn't solved and sadly i have to put content in title and displayName to solve it.

did you find anything ? I want to handle these merge conflicts and collaboration for my notes app.