Merge simultaneous diagram edits on Confluence Server

Collaboration in Confluence got a massive boost in version 6.0 when Atlassian added support for collaborative editing, and you can now merge simultaneous changes on draw.io diagrams in draw.io for Confluence Server.