added conflicting file back