deleted conflicted copy