remove dropbox conflicts