Add dropbox conflicts function