I've been saying for ten years that the algorithms used for collaborative editing are no good for merging offline editing sessions. Such merges require user intervention. CRDTs will not solve this for you. Seems these people came to the same conclusion.