changes to items controller
conflict fix