restore conflicting file