resolved Dropbox conflicts