Very nice work on collaborative editing!
While the 'rich text' aspect is neat, I think the more important thing here is having a 'branch and merge' model where long-lived branches are a first-class design goal is huge.
I'm afraid "manual"/explicit conflict resolution will have to be a central part of that, that will need considerable work to get right UX-wise. But super valuable when we do get there.
Revel in the marvels of the universe. We are a collective of forward-thinking individuals who strive to better ourselves and our surroundings through constant creation. We express ourselves through music, art, games, and writing. We also put great value in play. A warm welcome to any like-minded people who feel these ideals resonate with them.