conflicting solved