Tool to identify and merge DropBox conflicted files