fixing dropbox conflicts