deleted conflicting file