deleted conflicting files