fixed some delete files by the dropbox episode and conflicted files