Fixed conflicts in items.