deleted conflicted copies