remove strange dropbox conflict