clear up conflicting file