fixed the conflicting file