deleted the conflicting file