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