Fixing dropbox conflicts