Removed a conflicting file