removing conflicting file