better items
fixing conflicts