SkyDrive saves old versions of your Office documents, though this is perhaps not as discoverable as it ought to be. Not sure what you mean by conflict manageme

SkyDrive saves old versions of your Office documents, though this is perhaps not as discoverable as it ought to be. Not sure what you mean by conflict management--in general, unless you have full coauthoring support (the Office Web Apps have partial support: OneNote and Excel support it on the web, Word, PowerPoint and OneNote support it in the client) it doesn't make much sense to have a 'conflict resolution' story. (Disclosure: I work on some of this stuff.)