Two conflicting file