Added conflicting file