Fix Dropbox conflicts automatically.