add ItemLogic
fix merging conflicts