Dropbox Conflict Resolving Tool