Remove conflicted