Conflicting file fixed.