Clean dropbox conflicted files