remove all dropbox conflicts