added a dropbox merging mode..still hacky