added conflicting files