deleted conflicting data