update all
deleted dropbox conflicted files.