clearing the conflicting file