Removed conflicting file