removed Dropbox conflict file