remove conflicted
remove cached