Changes for item and its subclasses.
Conflict was solved.