Document Conflict Handling

Added two new methods to help handle document conflicts. Now you can get a list of all conflicting versions of a document. Plus you can select a version from that list and choose it as the version to resolve the conflict with.