Resolving upload conflicts after working offline in Desktop Connector

Resolve file version conflicts when working offline.