Adding conflicting file