merging revisions to collaborations