remove conflicted