[gabidobocan]

Collaborating on different properties of a single object is no problem; for working on the same property we don't do diff/merge yet, it's just FIFO.

[janmonschke]

So if two users are working on the same textfield there is no way to merge their changes at the moment?

[gabidobocan]

Not yet - unless you do it client-side. We're working on having a proper implementation for this use case.