removed conflicted Dropbox files